[FFmpeg-cvslog] avcodec/mpeg4videodec: Ignore multiple VOL headers
Michael Niedermayer
git at videolan.org
Tue Feb 13 01:39:19 EET 2018
ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Fri Feb 9 22:24:58 2018 +0100| [dd422f1b5e6ced354e0a7edae54c043a9ef4f8cf] | committer: Michael Niedermayer
avcodec/mpeg4videodec: Ignore multiple VOL headers
Fixes: Ticket7005
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 63a4bdbf3b732504e54cc2b9ec0886e6242a90bc)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd422f1b5e6ced354e0a7edae54c043a9ef4f8cf
---
libavcodec/mpeg4videodec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index e6bc6e11a4..23dde9ee85 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2652,8 +2652,8 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb)
if (startcode >= 0x120 && startcode <= 0x12F) {
if (vol) {
- av_log(s->avctx, AV_LOG_ERROR, "Multiple VOL headers");
- return AVERROR_INVALIDDATA;
+ av_log(s->avctx, AV_LOG_WARNING, "Ignoring multiple VOL headers\n");
+ continue;
}
vol++;
if ((ret = decode_vol_header(ctx, gb)) < 0)
More information about the ffmpeg-cvslog
mailing list