From 0d8b943d204bd16fcf2f4a59c742e65a401dd3d0 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Fri, 2 Aug 2013 10:33:00 +0200 Subject: h264_sei: Return meaningful values Signed-off-by: Diego Biurrun --- libavcodec/h264_sei.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'libavcodec/h264_sei.c') diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 4fe5193dcc..dde5c2174c 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -61,7 +61,7 @@ static int decode_picture_timing(H264Context *h) h->sei_ct_type = 0; if (h->sei_pic_struct > SEI_PIC_STRUCT_FRAME_TRIPLING) - return -1; + return AVERROR_INVALIDDATA; num_clock_ts = sei_num_clock_ts_table[h->sei_pic_struct]; @@ -109,7 +109,7 @@ static int decode_unregistered_user_data(H264Context *h, int size) int e, build, i; if (size < 16) - return -1; + return AVERROR_INVALIDDATA; for (i = 0; i < sizeof(user_data) - 1 && i < size; i++) user_data[i] = get_bits(&h->gb, 8); @@ -150,7 +150,7 @@ static int decode_buffering_period(H264Context *h) if (sps_id > 31 || !h->sps_buffers[sps_id]) { av_log(h->avctx, AV_LOG_ERROR, "non-existing SPS %d referenced in buffering period\n", sps_id); - return -1; + return AVERROR_INVALIDDATA; } sps = h->sps_buffers[sps_id]; @@ -181,6 +181,7 @@ int ff_h264_decode_sei(H264Context *h) while (get_bits_left(&h->gb) > 16) { int size = 0; int type = 0; + int ret = 0; do type += show_bits(&h->gb, 8); @@ -192,20 +193,24 @@ int ff_h264_decode_sei(H264Context *h) switch (type) { case SEI_TYPE_PIC_TIMING: // Picture timing SEI - if (decode_picture_timing(h) < 0) - return -1; + ret = decode_picture_timing(h); + if (ret < 0) + return ret; break; case SEI_TYPE_USER_DATA_UNREGISTERED: - if (decode_unregistered_user_data(h, size) < 0) - return -1; + ret = decode_unregistered_user_data(h, size); + if (ret < 0) + return ret; break; case SEI_TYPE_RECOVERY_POINT: - if (decode_recovery_point(h) < 0) - return -1; + ret = decode_recovery_point(h); + if (ret < 0) + return ret; break; case SEI_BUFFERING_PERIOD: - if (decode_buffering_period(h) < 0) - return -1; + ret = decode_buffering_period(h); + if (ret < 0) + return ret; break; default: skip_bits(&h->gb, 8 * size); -- cgit v1.2.3