diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-05-01 01:25:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-05-01 01:43:06 +0200 |
| commit | 390703fcf5cdd54e728f97499a0747a941330d45 (patch) | |
| tree | 1bb5d619ddb6175dc0a4d594893d7f096e5441c0 /libavcodec/mpeg12dec.c | |
| parent | a67816bcce44c15ec48d7a83cc2e0709e3dc048a (diff) | |
| download | ffmpeg-390703fcf5cdd54e728f97499a0747a941330d45.tar.gz | |
avcodec/mpeg12dec: Do not choke on extra m704 alpha data
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpeg12dec.c')
| -rw-r--r-- | libavcodec/mpeg12dec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index f6089e4eb4..4c96a1a01c 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1896,6 +1896,10 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, av_log(avctx, AV_LOG_DEBUG, "Invalid MXF data found in video stream\n"); is_d10 = 1; } + if (left > 32 && show_bits_long(&gb, 32) == 0x201) { + av_log(avctx, AV_LOG_DEBUG, "skipping m704 alpha (unsupported)\n"); + goto eos; + } } if (left < 0 || |