diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-20 22:26:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-20 22:36:40 +0100 |
| commit | e98bac82e5152f492ef05deff562abb2c68ec2ca (patch) | |
| tree | 58771a16707237f10d5074213c625ef5160aabdb /libavcodec/x86/motion_est.c | |
| parent | 011d83de488d2051c485a1618dda0a43d77bcbc7 (diff) | |
| parent | 82bb3048013201c0095d2853d4623633d912252f (diff) | |
Merge commit '82bb3048013201c0095d2853d4623633d912252f'
* commit '82bb3048013201c0095d2853d4623633d912252f':
dsputil: Use correct type in me_cmp_func function pointer
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/x86/motion_est.c')
| -rw-r--r-- | libavcodec/x86/motion_est.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libavcodec/x86/motion_est.c b/libavcodec/x86/motion_est.c index 90b83468a8..78db925313 100644 --- a/libavcodec/x86/motion_est.c +++ b/libavcodec/x86/motion_est.c @@ -27,6 +27,7 @@ #include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "libavutil/x86/cpu.h" +#include "libavcodec/mpegvideo.h" #include "dsputil_x86.h" #if HAVE_INLINE_ASM @@ -94,7 +95,8 @@ static inline void sad8_1_mmxext(uint8_t *blk1, uint8_t *blk2, : "r" ((x86_reg) stride)); } -static int sad16_sse2(void *v, uint8_t *blk2, uint8_t *blk1, int stride, int h) +static int sad16_sse2(MpegEncContext *v, uint8_t *blk2, uint8_t *blk1, + int stride, int h) { int ret; __asm__ volatile ( @@ -325,7 +327,7 @@ static inline void sad8_y2a_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h) } #define PIX_SAD(suf) \ -static int sad8_ ## suf(void *v, uint8_t *blk2, \ +static int sad8_ ## suf(MpegEncContext *v, uint8_t *blk2, \ uint8_t *blk1, int stride, int h) \ { \ av_assert2(h == 8); \ @@ -339,7 +341,7 @@ static int sad8_ ## suf(void *v, uint8_t *blk2, \ return sum_ ## suf(); \ } \ \ -static int sad8_x2_ ## suf(void *v, uint8_t *blk2, \ +static int sad8_x2_ ## suf(MpegEncContext *v, uint8_t *blk2, \ uint8_t *blk1, int stride, int h) \ { \ av_assert2(h == 8); \ @@ -354,7 +356,7 @@ static int sad8_x2_ ## suf(void *v, uint8_t *blk2, \ return sum_ ## suf(); \ } \ \ -static int sad8_y2_ ## suf(void *v, uint8_t *blk2, \ +static int sad8_y2_ ## suf(MpegEncContext *v, uint8_t *blk2, \ uint8_t *blk1, int stride, int h) \ { \ av_assert2(h == 8); \ @@ -369,7 +371,7 @@ static int sad8_y2_ ## suf(void *v, uint8_t *blk2, \ return sum_ ## suf(); \ } \ \ -static int sad8_xy2_ ## suf(void *v, uint8_t *blk2, \ +static int sad8_xy2_ ## suf(MpegEncContext *v, uint8_t *blk2, \ uint8_t *blk1, int stride, int h) \ { \ av_assert2(h == 8); \ @@ -383,7 +385,7 @@ static int sad8_xy2_ ## suf(void *v, uint8_t *blk2, \ return sum_ ## suf(); \ } \ \ -static int sad16_ ## suf(void *v, uint8_t *blk2, \ +static int sad16_ ## suf(MpegEncContext *v, uint8_t *blk2, \ uint8_t *blk1, int stride, int h) \ { \ __asm__ volatile ( \ @@ -397,7 +399,7 @@ static int sad16_ ## suf(void *v, uint8_t *blk2, \ return sum_ ## suf(); \ } \ \ -static int sad16_x2_ ## suf(void *v, uint8_t *blk2, \ +static int sad16_x2_ ## suf(MpegEncContext *v, uint8_t *blk2, \ uint8_t *blk1, int stride, int h) \ { \ __asm__ volatile ( \ @@ -412,7 +414,7 @@ static int sad16_x2_ ## suf(void *v, uint8_t *blk2, \ return sum_ ## suf(); \ } \ \ -static int sad16_y2_ ## suf(void *v, uint8_t *blk2, \ +static int sad16_y2_ ## suf(MpegEncContext *v, uint8_t *blk2, \ uint8_t *blk1, int stride, int h) \ { \ __asm__ volatile ( \ @@ -427,7 +429,7 @@ static int sad16_y2_ ## suf(void *v, uint8_t *blk2, \ return sum_ ## suf(); \ } \ \ -static int sad16_xy2_ ## suf(void *v, uint8_t *blk2, \ +static int sad16_xy2_ ## suf(MpegEncContext *v, uint8_t *blk2, \ uint8_t *blk1, int stride, int h) \ { \ __asm__ volatile ( \ |