aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-02-09 22:24:58 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-02-12 03:07:59 +0100
commitdd422f1b5e6ced354e0a7edae54c043a9ef4f8cf (patch)
tree5452eeef3b047917154d5aba69bb6d8e7c2d52a4
parent66f831a8d1bff8d218e0a2a2ab8f41968e63005b (diff)
downloadffmpeg-dd422f1b5e6ced354e0a7edae54c043a9ef4f8cf.tar.gz
avcodec/mpeg4videodec: Ignore multiple VOL headers
Fixes: Ticket7005 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 63a4bdbf3b732504e54cc2b9ec0886e6242a90bc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/mpeg4videodec.c4
1 files 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)