From: Michael Niedermayer <michael@niedermayer.cc>
Date: Fri, 9 Feb 2018 21:24:58 +0000 (+0100)
Subject: avcodec/mpeg4videodec: Ignore multiple VOL headers
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=63a4bdbf3b732504e54cc2b9ec0886e6242a90bc;p=ffmpeg

avcodec/mpeg4videodec: Ignore multiple VOL headers

Fixes: Ticket7005

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index 756753e2fc1..19210d97fe6 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -2707,8 +2707,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)