diff options
| author | James Almer <jamrial@gmail.com> | 2014-05-30 18:49:23 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-31 00:29:00 +0200 |
| commit | 4ac41a52e2be5430a1fc418a07798d6d0ee4e02a (patch) | |
| tree | db2e372c1d7811ff658bf0e246d746e3953757e5 | |
| parent | 83b8987df70212970a564467aff415157f98f8de (diff) | |
| download | ffmpeg-4ac41a52e2be5430a1fc418a07798d6d0ee4e02a.tar.gz | |
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>
| -rw-r--r-- | libavcodec/x86/huffyuvdsp.h | 4 | ||||
| -rw-r--r-- | libavcodec/x86/huffyuvdsp_init.c | 4 | ||||
| -rw-r--r-- | libavcodec/x86/huffyuvdsp_mmx.c | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/libavcodec/x86/huffyuvdsp.h b/libavcodec/x86/huffyuvdsp.h index 269126a6a6..9e47be9315 100644 --- a/libavcodec/x86/huffyuvdsp.h +++ b/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 */ diff --git a/libavcodec/x86/huffyuvdsp_init.c b/libavcodec/x86/huffyuvdsp_init.c index d3d7a26a4d..58a88e8492 100644 --- a/libavcodec/x86/huffyuvdsp_init.c +++ b/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); diff --git a/libavcodec/x86/huffyuvdsp_mmx.c b/libavcodec/x86/huffyuvdsp_mmx.c index bd7b840ecc..2dbdac1611 100644 --- a/libavcodec/x86/huffyuvdsp_mmx.c +++ b/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; |