[FFmpeg-devel] [PATCH] swscale: fix To{Y,UV} extern prototypes.

Clément Bœsch ubitux at gmail.com
Sun Sep 30 10:54:02 CEST 2012


This fix a bunch of "assignment from incompatible pointer type" warnings
with GCC.
---
What I'm afraid of is that the prototypes don't seem to match what's in
sws/x86/input.asm (based on the comments) in comparison to the C versions in
sws/swscale.c.

AFAIU, those prototypes were simplified by libav but it seems they were kept
unchanged in FFmpeg (because of a bug? because the prototypes could be shared
with the others functions?). Though, it might be important to check the if the
ASM versions of yuy2ToY and yuy2ToUV are actually doing the same as the _c
ones.
---
 libswscale/x86/swscale.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
index 102a4e6..de59a2b 100644
--- a/libswscale/x86/swscale.c
+++ b/libswscale/x86/swscale.c
@@ -342,11 +342,14 @@ VSCALE_FUNCS(avx, avx);
 
 #define INPUT_Y_FUNC(fmt, opt) \
 extern void ff_ ## fmt ## ToY_  ## opt(uint8_t *dst, const uint8_t *src, \
+                                       const uint8_t *unused1, const uint8_t *unused2, \
                                        int w, uint32_t *unused)
 #define INPUT_UV_FUNC(fmt, opt) \
 extern void ff_ ## fmt ## ToUV_ ## opt(uint8_t *dstU, uint8_t *dstV, \
-                                       const uint8_t *src, const uint8_t *unused1, \
-                                       int w, uint32_t *unused2)
+                                       const uint8_t *unused0, \
+                                       const uint8_t *src1, \
+                                       const uint8_t *src2, \
+                                       int w, uint32_t *unused)
 #define INPUT_FUNC(fmt, opt) \
     INPUT_Y_FUNC(fmt, opt); \
     INPUT_UV_FUNC(fmt, opt)
-- 
1.7.12.1



More information about the ffmpeg-devel mailing list