diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-14 23:58:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-15 00:09:15 +0200 |
| commit | bfd17046c138a9c68182f7b9c2cdd400675feb62 (patch) | |
| tree | 3d9aaf2369947da151b50f7581370942929da68f /libavcodec/mpeg12dec.c | |
| parent | 522256b374fe3b8edfea0040bdd5878ea8c8e37c (diff) | |
| download | ffmpeg-bfd17046c138a9c68182f7b9c2cdd400675feb62.tar.gz | |
avcodec/mpeg12dec: Fix decoding of faulty interlaced mpeg2
Fixes Ticket4721
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpeg12dec.c')
| -rw-r--r-- | libavcodec/mpeg12dec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index b0e5ae9adc..7fad75386c 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 && |