From 068b0f4f29bf0b38144e52b4ce5623400eb91d48 Mon Sep 17 00:00:00 2001
From: Benoit Fouet <benoit.fouet@free.fr>
Date: Wed, 2 May 2007 07:00:10 +0000
Subject: test if color conv fonction exists prior to using it

Originally committed as revision 23206 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
---
 libswscale/swscale.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'libswscale')

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 901e6c6149..1d26d125a1 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1611,6 +1611,8 @@ static int rgb2rgbWrapper(SwsContext *c, uint8_t* src[], int srcStride[], int sr
                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, uint8_t* src[], int srcStride[], int sr
             dstPtr+= dstStride[0];
         }
     }
+    }
     return srcSliceH;
 }
 
-- 
cgit v1.2.3