test if color conv fonction exists prior to using it

Originally committed as revision 23206 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
18 years ago · 068b0f4f29
parent 074a9d2b58
commit 068b0f4f29
1 changed files with 3 additions and 0 deletions
--- 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;
 }