mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
mpeg12dec: if lavc's mpeg2 decoder was asked to drop a frame, it could still output an old frame, and mess up timestamps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
411cc5c46a
commit
340e6735fe
@ -1968,7 +1968,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict)
|
||||
ff_xvmc_field_end(s);
|
||||
|
||||
/* end of slice reached */
|
||||
if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field) {
|
||||
if (/*s->mb_y << field_pic == s->mb_height &&*/ !s->first_field && !s->first_slice) {
|
||||
/* end of image */
|
||||
|
||||
s->current_picture_ptr->f.qscale_type = FF_QSCALE_TYPE_MPEG2;
|
||||
|
Loading…
Reference in New Issue
Block a user