mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-09 14:14:39 +02:00
don't exit decoder after decoding first field -> fixes angels.avi interlacing
Originally committed as revision 746 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
14ac09bfab
commit
d85c5979d0
@ -1247,7 +1247,7 @@ static int mjpeg_decode_frame(AVCodecContext *avctx,
|
|||||||
s->bottom_field ^= 1;
|
s->bottom_field ^= 1;
|
||||||
/* if not bottom field, do not output image yet */
|
/* if not bottom field, do not output image yet */
|
||||||
if (s->bottom_field)
|
if (s->bottom_field)
|
||||||
goto the_end;
|
goto not_the_end;
|
||||||
}
|
}
|
||||||
for(i=0;i<3;i++) {
|
for(i=0;i<3;i++) {
|
||||||
picture->data[i] = s->current_picture[i];
|
picture->data[i] = s->current_picture[i];
|
||||||
@ -1313,6 +1313,7 @@ static int mjpeg_decode_frame(AVCodecContext *avctx,
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
not_the_end:
|
||||||
}
|
}
|
||||||
the_end:
|
the_end:
|
||||||
return buf_ptr - buf;
|
return buf_ptr - buf;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user