# HG changeset patch # User benoit # Date 1178089210 0 # Node ID 6431b46104b7657892219e7b76fce829d68c830e # Parent 20be83485595db27c0b8535773ce6928af2b3d55 test if color conv fonction exists prior to using it diff -r 20be83485595 -r 6431b46104b7 libswscale/swscale.c --- a/libswscale/swscale.c Tue May 01 23:04:21 2007 +0000 +++ b/libswscale/swscale.c Wed May 02 07:00:10 2007 +0000 @@ -1611,6 +1611,8 @@ sws_format_name(srcFormat), sws_format_name(dstFormat)); } + if(conv) + { if (dstStride[0]*srcBpp == srcStride[0]*dstBpp) conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]); else @@ -1626,6 +1628,7 @@ dstPtr+= dstStride[0]; } } + } return srcSliceH; }