x86/huffyuvdsp: fix some prototypes
authorJames Almer <jamrial@gmail.com>
Fri, 30 May 2014 21:49:23 +0000 (18:49 -0300)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 May 2014 22:29:00 +0000 (00:29 +0200)
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
libavcodec/x86/huffyuvdsp_init.c
libavcodec/x86/huffyuvdsp_mmx.c

index 269126a..9e47be9 100644 (file)
 
 #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 */
index d3d7a26..58a88e8 100644 (file)
 #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);
index bd7b840..2dbdac1 100644 (file)
@@ -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;