diff options
| author | benoit <benoit@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-02 07:00:10 +0000 |
|---|---|---|
| committer | benoit <benoit@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-02 07:00:10 +0000 |
| commit | 75535c7902031fa8b2a447879f31c3f369b03427 (patch) | |
| tree | 39ffd3f45880151adf9764027b8e2f5796720174 /libswscale/swscale.c | |
| parent | 476078aed29bd258bf4e01b9b2a78bafb9840a41 (diff) | |
| download | mpv-75535c7902031fa8b2a447879f31c3f369b03427.tar.bz2 mpv-75535c7902031fa8b2a447879f31c3f369b03427.tar.xz | |
test if color conv fonction exists prior to using it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23206 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; } |