aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-09-30 00:52:40 +0200
committerClément Bœsch <ubitux@gmail.com>2012-09-30 20:45:32 +0200
commit178ecfc2570ffd4a5ab244d77a848533a5db2440 (patch)
tree9f1dce2443752a9b8cafac87079017777be58b99
parent0065d31dcdf08d50c471b984cb1b7c7b59951147 (diff)
downloadffmpeg-178ecfc2570ffd4a5ab244d77a848533a5db2440.tar.gz
swscale: fix To{Y,UV} extern prototypes.
This fix a bunch of "assignment from incompatible pointer type" warnings with GCC.
-rw-r--r--libswscale/x86/swscale.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
index 102a4e6f22..de59a2b3e0 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)