mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
10l
Originally committed as revision 2202 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
bee0d9e587
commit
dafc3856d9
17
ffmpeg.c
17
ffmpeg.c
@ -428,14 +428,15 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
|
|||||||
picture2 = &picture_tmp;
|
picture2 = &picture_tmp;
|
||||||
avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
|
avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height);
|
||||||
|
|
||||||
if (do_deinterlace && avpicture_deinterlace(picture2, picture,
|
if (do_deinterlace){
|
||||||
dec->pix_fmt, dec->width, dec->height) < 0) {
|
if(avpicture_deinterlace(picture2, picture,
|
||||||
/* if error, do not deinterlace */
|
dec->pix_fmt, dec->width, dec->height) < 0) {
|
||||||
av_free(buf);
|
/* if error, do not deinterlace */
|
||||||
buf = NULL;
|
av_free(buf);
|
||||||
picture2 = picture;
|
buf = NULL;
|
||||||
}
|
picture2 = picture;
|
||||||
else {
|
}
|
||||||
|
} else {
|
||||||
if (img_convert(picture2, dec->pix_fmt, picture,
|
if (img_convert(picture2, dec->pix_fmt, picture,
|
||||||
dec->pix_fmt, dec->width, dec->height) < 0) {
|
dec->pix_fmt, dec->width, dec->height) < 0) {
|
||||||
/* if error, do not copy */
|
/* if error, do not copy */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user