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.c | |
parent | 2c8a3aa985acc906ecab37357f2798da7cb9822d (diff) | |
parent | 2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428 (diff) | |
download | ffmpeg-streaming-5a49097b42cbc3eab888d15a91eeaf5520b5c381.zip ffmpeg-streaming-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.c')
-rw-r--r-- | libavcodec/simple_idct.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/simple_idct.c b/libavcodec/simple_idct.c index 65b2911..1d05b2f 100644 --- a/libavcodec/simple_idct.c +++ b/libavcodec/simple_idct.c @@ -58,7 +58,7 @@ and the butterfly must be multiplied by 0.5 * sqrt(2.0) */ #define C_SHIFT (4+1+12) -static inline void idct4col_put(uint8_t *dest, int line_size, const int16_t *col) +static inline void idct4col_put(uint8_t *dest, ptrdiff_t line_size, const int16_t *col) { int c0, c1, c2, c3, a0, a1, a2, a3; @@ -94,7 +94,7 @@ static inline void idct4col_put(uint8_t *dest, int line_size, const int16_t *col /* XXX: I think a 1.0/sqrt(2) normalization should be needed to compensate the extra butterfly stage - I don't have the full DV specification */ -void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block) +void ff_simple_idct248_put(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { int i; int16_t *ptr; @@ -137,7 +137,7 @@ void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block) #define C2 C_FIX(0.2705980501) #define C3 C_FIX(0.5) #define C_SHIFT (4+1+12) -static inline void idct4col_add(uint8_t *dest, int line_size, const int16_t *col) +static inline void idct4col_add(uint8_t *dest, ptrdiff_t line_size, const int16_t *col) { int c0, c1, c2, c3, a0, a1, a2, a3; @@ -182,7 +182,7 @@ static inline void idct4row(int16_t *row) row[3]= (c0 - c1) >> R_SHIFT; } -void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block) +void ff_simple_idct84_add(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { int i; @@ -197,7 +197,7 @@ void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block) } } -void ff_simple_idct48_add(uint8_t *dest, int line_size, int16_t *block) +void ff_simple_idct48_add(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { int i; @@ -212,7 +212,7 @@ void ff_simple_idct48_add(uint8_t *dest, int line_size, int16_t *block) } } -void ff_simple_idct44_add(uint8_t *dest, int line_size, int16_t *block) +void ff_simple_idct44_add(uint8_t *dest, ptrdiff_t line_size, int16_t *block) { int i; |