aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-10 00:16:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-10 00:19:49 +0200
commit92c29914de3da5776adea361bd3add0c1969b883 (patch)
treec46b2dec87a3389e76b6ca8b1f7d04ec1b1cd59f
parentefc66d69bfb622e874d883e0b304cf18b12e41bd (diff)
downloadffmpeg-92c29914de3da5776adea361bd3add0c1969b883.tar.gz
avcodec/hevc_sei: factor return 1 out of if/else chain
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/hevc_sei.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index 6dfe69d57e..5bb5c9010a 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)