diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-21 14:29:52 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-21 14:29:52 -0300 |
| commit | 5a49097b42cbc3eab888d15a91eeaf5520b5c381 (patch) | |
| tree | 080300f20bca98deac895f2ca86a25b72a8428e8 /libavcodec/alpha | |
| parent | 2c8a3aa985acc906ecab37357f2798da7cb9822d (diff) | |
| parent | 2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428 (diff) | |
Merge commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428'
* commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428':
idct: Change type of array stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/alpha')
| -rw-r--r-- | libavcodec/alpha/idctdsp_alpha.h | 4 | ||||
| -rw-r--r-- | libavcodec/alpha/simple_idct_alpha.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/alpha/idctdsp_alpha.h b/libavcodec/alpha/idctdsp_alpha.h index bf984950f2..8cc969d7de 100644 --- a/libavcodec/alpha/idctdsp_alpha.h +++ b/libavcodec/alpha/idctdsp_alpha.h @@ -28,7 +28,7 @@ extern void (*add_pixels_clamped_axp_p)(const int16_t *block, uint8_t *pixels, ptrdiff_t line_size); void ff_simple_idct_axp(int16_t *block); -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 ff_simple_idct_put_axp(uint8_t *dest, ptrdiff_t line_size, int16_t *block); +void ff_simple_idct_add_axp(uint8_t *dest, ptrdiff_t line_size, int16_t *block); #endif /* AVCODEC_ALPHA_IDCTDSP_ALPHA_H */ diff --git a/libavcodec/alpha/simple_idct_alpha.c b/libavcodec/alpha/simple_idct_alpha.c index 04be0cef06..6e377ef243 100644 --- a/libavcodec/alpha/simple_idct_alpha.c +++ b/libavcodec/alpha/simple_idct_alpha.c @@ -290,13 +290,13 @@ void ff_simple_idct_axp(int16_t *block) } } -void ff_simple_idct_put_axp(uint8_t *dest, int line_size, int16_t *block) +void ff_simple_idct_put_axp(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { ff_simple_idct_axp(block); put_pixels_clamped_axp_p(block, dest, line_size); } -void ff_simple_idct_add_axp(uint8_t *dest, int line_size, int16_t *block) +void ff_simple_idct_add_axp(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { ff_simple_idct_axp(block); add_pixels_clamped_axp_p(block, dest, line_size); |