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

Clément Bœsch git at videolan.org
Sun Sep 30 20:47:55 CEST 2012


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sun Sep 30 00:52:40 2012 +0200| [178ecfc2570ffd4a5ab244d77a848533a5db2440] | committer: Clément Bœsch

swscale: fix To{Y,UV} extern prototypes.

This fix a bunch of "assignment from incompatible pointer type" warnings
with GCC.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=178ecfc2570ffd4a5ab244d77a848533a5db2440
---

 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)



More information about the ffmpeg-cvslog mailing list