OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
074a9d2
)
test if color conv fonction exists prior to using it
author
Benoit Fouet
<benoit.fouet@free.fr>
Wed, 2 May 2007 07:00:10 +0000
(07:00 +0000)
committer
Benoit Fouet
<benoit.fouet@free.fr>
Wed, 2 May 2007 07:00:10 +0000
(07:00 +0000)
Originally committed as revision 23206 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
libswscale/swscale.c
patch
|
blob
|
history
diff --git
a/libswscale/swscale.c
b/libswscale/swscale.c
index
901e6c6
..
1d26d12
100644
(file)
--- 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;
}