Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-31 07:20:42 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-07-31 14:56:21 +0400
commit37ec7d291eacedfacdce21332f4c719f2be79d12 (patch)
treebe0533a4d5c09f2ee518427ad85800775b3c59c5 /libavcodec/mpeg4video_parser.c
parentdc315cdb4ecffb7ec4d3496f1d0c8d0c123f0a7b (diff)
avcodec/mpeg4video_parser: Check for extradata parsing failure
Found-by: CSA Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video_parser.c')
-rw-r--r--libavcodec/mpeg4video_parser.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c
index 86bcc9eb53..b7718f62d9 100644
--- a/libavcodec/mpeg4video_parser.c
+++ b/libavcodec/mpeg4video_parser.c
@@ -88,6 +88,8 @@ static int mpeg4_decode_header(AVCodecParserContext *s1, AVCodecContext *avctx,
if (avctx->extradata_size && pc->first_picture) {
init_get_bits(gb, avctx->extradata, avctx->extradata_size * 8);
ret = ff_mpeg4_decode_picture_header(dec_ctx, gb);
+ if (ret < 0)
+ av_log(avctx, AV_LOG_WARNING, "Failed to parse extradata\n");
}
init_get_bits(gb, buf, 8 * buf_size);