[MPlayer-cvslog] r23206 - trunk/libswscale/swscale.c

benoit subversion at mplayerhq.hu
Wed May 2 09:00:11 CEST 2007


Author: benoit
Date: Wed May  2 09:00:10 2007
New Revision: 23206

Log:

test if color conv fonction exists prior to using it



Modified:
   trunk/libswscale/swscale.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	(original)
+++ trunk/libswscale/swscale.c	Wed May  2 09:00:10 2007
@@ -1611,6 +1611,8 @@ static int rgb2rgbWrapper(SwsContext *c,
                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 @@ static int rgb2rgbWrapper(SwsContext *c,
             dstPtr+= dstStride[0];
         }
     }
+    }
     return srcSliceH;
 }
 



More information about the MPlayer-cvslog mailing list