ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sun May 1 01:25:20 2016 +0200| [390703fcf5cdd54e728f97499a0747a941330d45] | committer: Michael Niedermayer
avcodec/mpeg12dec: Do not choke on extra m704 alpha data Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=390703fcf5cdd54e728f97499a0747a941330d45 --- libavcodec/mpeg12dec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index f6089e4..4c96a1a 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 || _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
