diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 12:18:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 12:18:25 +0100 |
| commit | ede45c4e1da8bd2fefc89ea63e57a49e6c0a3e19 (patch) | |
| tree | c288d3a3a358016a16aefbe702b454a9777cf98f /libavcodec/alpha | |
| parent | 127ff88639e78b9d16fecb973c41b86a843b4fa7 (diff) | |
| parent | 25841dfe806a13de526ae09c11149ab1f83555a8 (diff) | |
| download | ffmpeg-ede45c4e1da8bd2fefc89ea63e57a49e6c0a3e19.tar.gz | |
Merge commit '25841dfe806a13de526ae09c11149ab1f83555a8'
* commit '25841dfe806a13de526ae09c11149ab1f83555a8':
Use ptrdiff_t instead of int for {avg, put}_pixels line_size parameter.
Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alpha')
| -rw-r--r-- | libavcodec/alpha/dsputil_alpha.c | 14 | ||||
| -rw-r--r-- | libavcodec/alpha/dsputil_alpha.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/alpha/dsputil_alpha.c b/libavcodec/alpha/dsputil_alpha.c index 80d218aa54..0d856315a5 100644 --- a/libavcodec/alpha/dsputil_alpha.c +++ b/libavcodec/alpha/dsputil_alpha.c @@ -32,7 +32,7 @@ void (*add_pixels_clamped_axp_p)(const int16_t *block, uint8_t *pixels, /* These functions were the base for the optimized assembler routines, and remain here for documentation purposes. */ static void put_pixels_clamped_mvi(const int16_t *block, uint8_t *pixels, - int line_size) + ptrdiff_t line_size) { int i = 8; uint64_t clampmask = zap(-1, 0xaa); /* 0x00ff00ff00ff00ff */ @@ -56,7 +56,7 @@ static void put_pixels_clamped_mvi(const int16_t *block, uint8_t *pixels, } void add_pixels_clamped_mvi(const int16_t *block, uint8_t *pixels, - int line_size) + ptrdiff_t line_size) { int h = 8; /* Keep this function a leaf function by generating the constants @@ -211,8 +211,8 @@ static inline uint64_t avg4(uint64_t l1, uint64_t l2, uint64_t l3, uint64_t l4) #define MAKE_OP(OPNAME, SUFF, OPKIND, STORE) \ static void OPNAME ## _pixels ## SUFF ## _axp \ - (uint8_t *av_restrict block, const uint8_t *av_restrict pixels, \ - int line_size, int h) \ + (uint8_t *restrict block, const uint8_t *restrict pixels, \ + ptrdiff_t line_size, int h) \ { \ if ((size_t) pixels & 0x7) { \ OPKIND(uldq, STORE); \ @@ -222,8 +222,8 @@ static void OPNAME ## _pixels ## SUFF ## _axp \ } \ \ static void OPNAME ## _pixels16 ## SUFF ## _axp \ - (uint8_t *av_restrict block, const uint8_t *av_restrict pixels, \ - int line_size, int h) \ + (uint8_t *restrict block, const uint8_t *restrict pixels, \ + ptrdiff_t line_size, int h) \ { \ OPNAME ## _pixels ## SUFF ## _axp(block, pixels, line_size, h); \ OPNAME ## _pixels ## SUFF ## _axp(block + 8, pixels + 8, line_size, h); \ @@ -262,7 +262,7 @@ PIXOP(put_no_rnd, STORE); PIXOP(avg_no_rnd, STORE); static void put_pixels16_axp_asm(uint8_t *block, const uint8_t *pixels, - int line_size, int h) + ptrdiff_t line_size, int h) { put_pixels_axp_asm(block, pixels, line_size, h); put_pixels_axp_asm(block + 8, pixels + 8, line_size, h); diff --git a/libavcodec/alpha/dsputil_alpha.h b/libavcodec/alpha/dsputil_alpha.h index cdb51358de..16f2d5e6b3 100644 --- a/libavcodec/alpha/dsputil_alpha.h +++ b/libavcodec/alpha/dsputil_alpha.h @@ -26,7 +26,7 @@ void ff_simple_idct_put_axp(uint8_t *dest, int line_size, int16_t *block); void ff_simple_idct_add_axp(uint8_t *dest, int line_size, int16_t *block); void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels, - int line_size, int h); + ptrdiff_t line_size, int h); void put_pixels_clamped_mvi_asm(const int16_t *block, uint8_t *pixels, int line_size); void add_pixels_clamped_mvi_asm(const int16_t *block, uint8_t *pixels, |