From 86404ffba2d8795d44cffbbeee3b3c7c2cc6afcc Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Tue, 18 Dec 2007 13:49:58 +0000 Subject: [PATCH] avoid infinite loop if pixel format conversion does not exist Originally committed as revision 11259 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/imgconvert.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 0299dbb593..229a3a3a0c 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -2555,6 +2555,8 @@ int img_convert(AVPicture *dst, int dst_pix_fmt, else 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) return -1; ret = -1;