From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sat, 30 Apr 2016 23:25:20 +0000 (+0200)
Subject: avcodec/mpeg12dec: Do not choke on extra m704 alpha data
X-Git-Tag: android-x86-7.1-r1~5433
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=390703fcf5cdd54e728f97499a0747a941330d45;p=android-x86%2Fexternal-ffmpeg.git

avcodec/mpeg12dec: Do not choke on extra m704 alpha data

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

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 ||