diff options
author | James Almer <jamrial@gmail.com> | 2017-03-21 20:29:52 +0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-21 20:29:52 +0300 |
commit | 5a49097b42cbc3eab888d15a91eeaf5520b5c381 (patch) | |
tree | 080300f20bca98deac895f2ca86a25b72a8428e8 /libavcodec/idctdsp.c | |
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/idctdsp.c')
-rw-r--r-- | libavcodec/idctdsp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index 37f4640f0d..84dd6457bd 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -207,33 +207,33 @@ static void add_pixels_clamped2_c(const int16_t *block, uint8_t *av_restrict pix } } -static void ff_jref_idct4_put(uint8_t *dest, int line_size, int16_t *block) +static void ff_jref_idct4_put(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { ff_j_rev_dct4 (block); put_pixels_clamped4_c(block, dest, line_size); } -static void ff_jref_idct4_add(uint8_t *dest, int line_size, int16_t *block) +static void ff_jref_idct4_add(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { ff_j_rev_dct4 (block); add_pixels_clamped4_c(block, dest, line_size); } -static void ff_jref_idct2_put(uint8_t *dest, int line_size, int16_t *block) +static void ff_jref_idct2_put(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { ff_j_rev_dct2 (block); put_pixels_clamped2_c(block, dest, line_size); } -static void ff_jref_idct2_add(uint8_t *dest, int line_size, int16_t *block) +static void ff_jref_idct2_add(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { ff_j_rev_dct2 (block); add_pixels_clamped2_c(block, dest, line_size); } -static void ff_jref_idct1_put(uint8_t *dest, int line_size, int16_t *block) +static void ff_jref_idct1_put(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { dest[0] = av_clip_uint8((block[0] + 4)>>3); } -static void ff_jref_idct1_add(uint8_t *dest, int line_size, int16_t *block) +static void ff_jref_idct1_add(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { dest[0] = av_clip_uint8(dest[0] + ((block[0] + 4)>>3)); } |