[FFmpeg-cvslog] avcodec/mpeg12dec: Fix decoding of faulty interlaced mpeg2

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 14 23:58:08 2015 +0200| [bfd17046c138a9c68182f7b9c2cdd400675feb62] | committer: Michael Niedermayer

avcodec/mpeg12dec: Fix decoding of faulty interlaced mpeg2

Fixes Ticket4721

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bfd17046c138a9c68182f7b9c2cdd400675feb62
---

 libavcodec/mpeg12dec.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index b0e5ae9..7fad753 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -1938,7 +1938,6 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
             // area, we detect this here instead of running into the end expecting
             // more data
             if (s->mb_y >= ((s->height + 15) >> 4) &&
-                s->progressive_frame &&
                 !s->progressive_sequence &&
                 get_bits_left(&s->gb) <= 8 &&
                 get_bits_left(&s->gb) >= 0 &&