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/simple_idct_template.c | |
| parent | 2c8a3aa985acc906ecab37357f2798da7cb9822d (diff) | |
| parent | 2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428 (diff) | |
| download | ffmpeg-5a49097b42cbc3eab888d15a91eeaf5520b5c381.tar.gz | |
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/simple_idct_template.c')
| -rw-r--r-- | libavcodec/simple_idct_template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/simple_idct_template.c b/libavcodec/simple_idct_template.c index c669767761..f532313441 100644 --- a/libavcodec/simple_idct_template.c +++ b/libavcodec/simple_idct_template.c @@ -250,7 +250,7 @@ static inline void FUNC(idctRowCondDC)(int16_t *row, int extra_shift) #ifdef EXTRA_SHIFT static inline void FUNC(idctSparseCol_extrashift)(int16_t *col) #else -static inline void FUNC(idctSparseColPut)(pixel *dest, int line_size, +static inline void FUNC(idctSparseColPut)(pixel *dest, ptrdiff_t line_size, int16_t *col) { SUINT a0, a1, a2, a3, b0, b1, b2, b3; @@ -274,7 +274,7 @@ static inline void FUNC(idctSparseColPut)(pixel *dest, int line_size, dest[0] = av_clip_pixel((int)(a0 - b0) >> COL_SHIFT); } -static inline void FUNC(idctSparseColAdd)(pixel *dest, int line_size, +static inline void FUNC(idctSparseColAdd)(pixel *dest, ptrdiff_t line_size, int16_t *col) { int a0, a1, a2, a3, b0, b1, b2, b3; @@ -316,7 +316,7 @@ static inline void FUNC(idctSparseCol)(int16_t *col) } #ifndef EXTRA_SHIFT -void FUNC(ff_simple_idct_put)(uint8_t *dest_, int line_size, int16_t *block) +void FUNC(ff_simple_idct_put)(uint8_t *dest_, ptrdiff_t line_size, int16_t *block) { pixel *dest = (pixel *)dest_; int i; @@ -330,7 +330,7 @@ void FUNC(ff_simple_idct_put)(uint8_t *dest_, int line_size, int16_t *block) FUNC(idctSparseColPut)(dest + i, line_size, block + i); } -void FUNC(ff_simple_idct_add)(uint8_t *dest_, int line_size, int16_t *block) +void FUNC(ff_simple_idct_add)(uint8_t *dest_, ptrdiff_t line_size, int16_t *block) { pixel *dest = (pixel *)dest_; int i; |