x86/huffyuvdsp: fix some prototypes

Remove duplicate prototypes and fix int -> intptr_t in another
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/x86/huffyuvdsp.h

@@ -21,10 +21,8 @@
 
 #include <stdint.h>
 
-void ff_add_bytes_mmx(uint8_t *dst, uint8_t *src, int w);
-
 void ff_add_hfyu_median_pred_cmov(uint8_t *dst, const uint8_t *top,
-                                  const uint8_t *diff, int w,
+                                  const uint8_t *diff, intptr_t w,
                                   int *left, int *left_top);
 
 #endif /* AVCODEC_X86_HUFFYUVDSP_H */

libavcodec/x86/huffyuvdsp_init.c

@@ -22,13 +22,11 @@
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
 #include "libavcodec/huffyuvdsp.h"
+#include "huffyuvdsp.h"
 
 void ff_add_bytes_mmx(uint8_t *dst, uint8_t *src, intptr_t w);
 void ff_add_bytes_sse2(uint8_t *dst, uint8_t *src, intptr_t w);
 
-void ff_add_hfyu_median_pred_cmov(uint8_t *dst, const uint8_t *top,
-                                  const uint8_t *diff, intptr_t w,
-                                  int *left, int *left_top);
 void ff_add_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *top,
                                     const uint8_t *diff, intptr_t w,
                                     int *left, int *left_top);

libavcodec/x86/huffyuvdsp_mmx.c

@@ -24,7 +24,7 @@
 
 #if HAVE_INLINE_ASM && HAVE_7REGS && ARCH_X86_32
 void ff_add_hfyu_median_pred_cmov(uint8_t *dst, const uint8_t *top,
-                                  const uint8_t *diff, int w,
+                                  const uint8_t *diff, intptr_t w,
                                   int *left, int *left_top)
 {
     x86_reg w2 = -w;