diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-09 22:24:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-04-13 00:35:15 +0200 |
| commit | f03616d2a43833cad5bda2fdf6f605aa09aa89e0 (patch) | |
| tree | 02232bbd83ff97721c55b428c5548064433acb8d | |
| parent | 0df3ad79c7d8d8740693deedccf82e7c28bb60b6 (diff) | |
| download | ffmpeg-f03616d2a43833cad5bda2fdf6f605aa09aa89e0.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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index d0162d1074..319a3809ea 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2670,8 +2670,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) |