ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Jul 10 00:16:29 2014 +0200| [92c29914de3da5776adea361bd3add0c1969b883] | committer: Michael Niedermayer
avcodec/hevc_sei: factor return 1 out of if/else chain Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92c29914de3da5776adea361bd3add0c1969b883 --- libavcodec/hevc_sei.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c index 6dfe69d..5bb5c90 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -160,13 +160,10 @@ static int decode_nal_sei_message(HEVCContext *s) if (s->nal_unit_type == NAL_SEI_PREFIX) { if (payload_type == 256 /*&& s->decode_checksum_sei*/) { decode_nal_sei_decoded_picture_hash(s); - return 1; } else if (payload_type == 45) { decode_nal_sei_frame_packing_arrangement(s); - return 1; } else if (payload_type == 47) { decode_nal_sei_display_orientation(s); - return 1; } else if (payload_type == 1){ int ret = decode_pic_timing(s); 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){ active_parameter_sets(s); av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); - return 1; } else { av_log(s->avctx, AV_LOG_DEBUG, "Skipped PREFIX SEI %d\n", payload_type); skip_bits(gb, 8*payload_size); - return 1; } } else { /* nal_unit_type == NAL_SEI_SUFFIX */ 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); skip_bits(gb, 8 * payload_size); } - return 1; } + return 1; } static int more_rbsp_data(GetBitContext *gb) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
