Mercurial > libavcodec.hg

comparison imgconvert.c @ 6040:08e4fbdbf554 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid infinite loop if pixel format conversion does not exist
author bcoudurier
date Tue, 18 Dec 2007 13:49:58 +0000
parents 80103098c797
children e09251439406
comparison
equal deleted inserted replaced
6039:b4d22e42528c 6040:08e4fbdbf554
2553 if (src_pix->is_alpha && dst_pix->is_alpha) 2553 if (src_pix->is_alpha && dst_pix->is_alpha)
2554 int_pix_fmt = PIX_FMT_RGB32; 2554 int_pix_fmt = PIX_FMT_RGB32;
2555 else 2555 else
2556 int_pix_fmt = PIX_FMT_RGB24; 2556 int_pix_fmt = PIX_FMT_RGB24;
2557 } 2557 }
2558 if (src_pix_fmt == int_pix_fmt)
2559 return -1;
2558 if (avpicture_alloc(tmp, int_pix_fmt, dst_width, dst_height) < 0) 2560 if (avpicture_alloc(tmp, int_pix_fmt, dst_width, dst_height) < 0)
2559 return -1; 2561 return -1;
2560 ret = -1; 2562 ret = -1;
2561 if (img_convert(tmp, int_pix_fmt, 2563 if (img_convert(tmp, int_pix_fmt,
2562 src, src_pix_fmt, src_width, src_height) < 0) 2564 src, src_pix_fmt, src_width, src_height) < 0)