[FFmpeg-cvslog] avcodec/mpeg4video_parser: Check for extradata parsing failure
Michael Niedermayer
git at videolan.org
Thu Jul 31 13:04:09 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 31 05:20:42 2014 +0200| [37ec7d291eacedfacdce21332f4c719f2be79d12] | committer: Michael Niedermayer
avcodec/mpeg4video_parser: Check for extradata parsing failure
Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=37ec7d291eacedfacdce21332f4c719f2be79d12
---
libavcodec/mpeg4video_parser.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c
index 86bcc9e..b7718f6 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);
More information about the ffmpeg-cvslog
mailing list