mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 20:19:55 +00:00
Change img_convert() from img_fmt to img_fmt with img_copy()
Originally committed as revision 5236 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
22dde0e955
commit
c17be81763
8
ffmpeg.c
8
ffmpeg.c
@ -626,13 +626,7 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void
|
|||||||
picture2 = picture;
|
picture2 = picture;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (img_convert(picture2, dec->pix_fmt, picture,
|
img_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height);
|
||||||
dec->pix_fmt, dec->width, dec->height) < 0) {
|
|
||||||
/* if error, do not copy */
|
|
||||||
av_free(buf);
|
|
||||||
buf = NULL;
|
|
||||||
picture2 = picture;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
picture2 = picture;
|
picture2 = picture;
|
||||||
|
Loading…
Reference in New Issue
Block a user