Commit a23dd036 authored by benoit's avatar benoit

test if color conv fonction exists prior to using it



git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@23206 b3059339-0415-0410-9bf9-f77b7e298cf2
parent 3af61ac7
...@@ -1611,6 +1611,8 @@ static int rgb2rgbWrapper(SwsContext *c, uint8_t* src[], int srcStride[], int sr ...@@ -1611,6 +1611,8 @@ static int rgb2rgbWrapper(SwsContext *c, uint8_t* src[], int srcStride[], int sr
sws_format_name(srcFormat), sws_format_name(dstFormat)); sws_format_name(srcFormat), sws_format_name(dstFormat));
} }
if(conv)
{
if (dstStride[0]*srcBpp == srcStride[0]*dstBpp) if (dstStride[0]*srcBpp == srcStride[0]*dstBpp)
conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]); conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
else else
...@@ -1626,6 +1628,7 @@ static int rgb2rgbWrapper(SwsContext *c, uint8_t* src[], int srcStride[], int sr ...@@ -1626,6 +1628,7 @@ static int rgb2rgbWrapper(SwsContext *c, uint8_t* src[], int srcStride[], int sr
dstPtr+= dstStride[0]; dstPtr+= dstStride[0];
} }
} }
}
return srcSliceH; return srcSliceH;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment