eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-14 02:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

x86/huffyuvdsp: fix some prototypes

Browse Source 
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>
This commit is contained in:
James Almer
2014-05-30 18:49:23 -03:00
committed by Michael Niedermayer
parent 83b8987df7
commit 4ac41a52e2
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/x86/huffyuvdsp.h
View File

@@ -21,10 +21,8 @@
#include <stdint.h> #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, 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); int *left, int *left_top);
#endif /* AVCODEC_X86_HUFFYUVDSP_H */ #endif /* AVCODEC_X86_HUFFYUVDSP_H */

4
libavcodec/x86/huffyuvdsp_init.c
View File

@@ -22,13 +22,11 @@
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavcodec/huffyuvdsp.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_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_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, void ff_add_hfyu_median_pred_mmxext(uint8_t *dst, const uint8_t *top,
const uint8_t *diff, intptr_t w, const uint8_t *diff, intptr_t w,
int *left, int *left_top); int *left, int *left_top);

2
libavcodec/x86/huffyuvdsp_mmx.c
View File

@@ -24,7 +24,7 @@
#if HAVE_INLINE_ASM && HAVE_7REGS && ARCH_X86_32 #if HAVE_INLINE_ASM && HAVE_7REGS && ARCH_X86_32
void ff_add_hfyu_median_pred_cmov(uint8_t *dst, const uint8_t *top, 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) int *left, int *left_top)
{ {
x86_reg w2 = -w; x86_reg w2 = -w;