RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/hevc_sei: factor return 1 out of if/else chain 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-10 00:16:29 +02:00
parent efc66d69bf
commit 92c29914de
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/hevc_sei.c
View File

@ -160,13 +160,10 @@ static int decode_nal_sei_message(HEVCContext *s)
if (s->nal_unit_type == NAL_SEI_PREFIX) { if (s->nal_unit_type == NAL_SEI_PREFIX) {
if (payload_type == 256 /*&& s->decode_checksum_sei*/) { if (payload_type == 256 /*&& s->decode_checksum_sei*/) {
decode_nal_sei_decoded_picture_hash(s); decode_nal_sei_decoded_picture_hash(s);
return 1;
} else if (payload_type == 45) { } else if (payload_type == 45) {
decode_nal_sei_frame_packing_arrangement(s); decode_nal_sei_frame_packing_arrangement(s);
return 1;
} else if (payload_type == 47) { } else if (payload_type == 47) {
decode_nal_sei_display_orientation(s); decode_nal_sei_display_orientation(s);
return 1;
} else if (payload_type == 1){ } else if (payload_type == 1){
int ret = decode_pic_timing(s); int ret = decode_pic_timing(s);
av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
@ -175,11 +172,9 @@ static int decode_nal_sei_message(HEVCContext *s)
} else if (payload_type == 129){ } else if (payload_type == 129){
active_parameter_sets(s); active_parameter_sets(s);
av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
return 1;
} else { } else {
av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type);
skip_bits(gb, 8*payload_size); skip_bits(gb, 8*payload_size);
return 1;
} }
} else { /* nal_unit_type == NAL_SEI_SUFFIX */ } else { /* nal_unit_type == NAL_SEI_SUFFIX */
if (payload_type == 132 /* && s->decode_checksum_sei */) if (payload_type == 132 /* && s->decode_checksum_sei */)
@ -188,8 +183,8 @@ static int decode_nal_sei_message(HEVCContext *s)
av_log(s->avctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", payload_type); av_log(s->avctx, AV_LOG_DEBUG, "Skipped SUFFIX SEI %d\n", payload_type);
skip_bits(gb, 8 * payload_size); skip_bits(gb, 8 * payload_size);
} }
return 1;
} }
return 1;
} }
static int more_rbsp_data(GetBitContext *gb) static int more_rbsp_data(GetBitContext *gb)