Commit 86404ffb authored by Baptiste Coudurier's avatar Baptiste Coudurier

avoid infinite loop if pixel format conversion does not exist

Originally committed as revision 11259 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent fe9bb347
...@@ -2555,6 +2555,8 @@ int img_convert(AVPicture *dst, int dst_pix_fmt, ...@@ -2555,6 +2555,8 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
else else
int_pix_fmt = PIX_FMT_RGB24; int_pix_fmt = PIX_FMT_RGB24;
} }
if (src_pix_fmt == int_pix_fmt)
return -1;
if (avpicture_alloc(tmp, int_pix_fmt, dst_width, dst_height) < 0) if (avpicture_alloc(tmp, int_pix_fmt, dst_width, dst_height) < 0)
return -1; return -1;
ret = -1; ret = -1;
......
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