Commit f95298c9 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/mpeg12dec: fix support for interlaced mpeg2 with missing last slice

Fixes Ticket3809
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7f852962
...@@ -1884,6 +1884,14 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y, ...@@ -1884,6 +1884,14 @@ static int mpeg_decode_slice(MpegEncContext *s, int mb_y,
} else } else
goto eos; goto eos;
} }
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 &&
s->mb_skip_run == -1 &&
show_bits(&s->gb, 8) == 0)
goto eos;
ff_init_block_index(s); ff_init_block_index(s);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment