aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-06-28 02:05:04 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-06-30 15:34:38 +0200
commit0bfab80a0d9fce0180e8aa2a947267f89b725091 (patch)
treedc8e0fdb85ce08e19321795eb2159d3632325789
parent0a49a62f998747cfa564d98d36a459fe70d3299b (diff)
downloadffmpeg-0bfab80a0d9fce0180e8aa2a947267f89b725091.tar.gz
h264_sei: Group error check outside the switch block
-rw-r--r--libavcodec/h264_sei.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 52ff2ff4bb..0e99f05cc2 100644
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -246,38 +246,28 @@ int ff_h264_decode_sei(H264Context *h)
switch (type) {
case SEI_TYPE_PIC_TIMING: // Picture timing SEI
ret = decode_picture_timing(h);
- if (ret < 0)
- return ret;
break;
case SEI_TYPE_USER_DATA_UNREGISTERED:
ret = decode_unregistered_user_data(h, size);
- if (ret < 0)
- return ret;
break;
case SEI_TYPE_RECOVERY_POINT:
ret = decode_recovery_point(h);
- if (ret < 0)
- return ret;
break;
case SEI_TYPE_BUFFERING_PERIOD:
ret = decode_buffering_period(h);
- if (ret < 0)
- return ret;
break;
case SEI_TYPE_FRAME_PACKING:
ret = decode_frame_packing_arrangement(h);
- if (ret < 0)
- return ret;
break;
case SEI_TYPE_DISPLAY_ORIENTATION:
ret = decode_display_orientation(h);
- if (ret < 0)
- return ret;
break;
default:
av_log(h->avctx, AV_LOG_DEBUG, "unknown SEI type %d\n", type);
skip_bits(&h->gb, 8 * size);
}
+ if (ret < 0)
+ return ret;
// FIXME check bits here
align_get_bits(&h->gb);