diff options
Diffstat (limited to 'libavcodec/alpha/me_cmp_alpha.c')
| -rw-r--r-- | libavcodec/alpha/me_cmp_alpha.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libavcodec/alpha/me_cmp_alpha.c b/libavcodec/alpha/me_cmp_alpha.c index 4e9e0f88dc..d5a78f1247 100644 --- a/libavcodec/alpha/me_cmp_alpha.c +++ b/libavcodec/alpha/me_cmp_alpha.c @@ -23,7 +23,8 @@ #include "libavcodec/me_cmp.h" #include "asm.h" -int pix_abs16x16_mvi_asm(void *v, const uint8_t *pix1, const uint8_t *pix2, int line_size, int h); +int pix_abs16x16_mvi_asm(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t line_size, int h); static inline uint64_t avg2(uint64_t a, uint64_t b) { @@ -44,7 +45,8 @@ static inline uint64_t avg4(uint64_t l1, uint64_t l2, uint64_t l3, uint64_t l4) return r1 + r2; } -static int pix_abs8x8_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2, int line_size, int h) +static int pix_abs8x8_mvi(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t line_size, int h) { int result = 0; @@ -119,7 +121,8 @@ int pix_abs16x16_mvi(const uint8_t *pix1, const uint8_t *pix2, int line_size) } #endif -static int pix_abs16x16_x2_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2, int line_size, int h) +static int pix_abs16x16_x2_mvi(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t line_size, int h) { int result = 0; uint64_t disalign = (size_t) pix2 & 0x7; @@ -192,7 +195,8 @@ static int pix_abs16x16_x2_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2 return result; } -static int pix_abs16x16_y2_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2, int line_size, int h) +static int pix_abs16x16_y2_mvi(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t line_size, int h) { int result = 0; @@ -245,7 +249,8 @@ static int pix_abs16x16_y2_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2 return result; } -static int pix_abs16x16_xy2_mvi(void *v, const uint8_t *pix1, const uint8_t *pix2, int line_size, int h) +static int pix_abs16x16_xy2_mvi(struct MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t line_size, int h) { int result = 0; |