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/ppc | |
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/ppc')
-rw-r--r-- | libavcodec/ppc/idctdsp.c | 4 | ||||
-rw-r--r-- | libavcodec/ppc/vc1dsp_altivec.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/ppc/idctdsp.c b/libavcodec/ppc/idctdsp.c index 80e71fdaf0..f1b42470fb 100644 --- a/libavcodec/ppc/idctdsp.c +++ b/libavcodec/ppc/idctdsp.c @@ -169,7 +169,7 @@ static void idct_altivec(int16_t *blk) block[7] = vx7; } -static void idct_put_altivec(uint8_t *dest, int stride, int16_t *blk) +static void idct_put_altivec(uint8_t *dest, ptrdiff_t stride, int16_t *blk) { vec_s16 *block = (vec_s16 *) blk; vec_u8 tmp; @@ -198,7 +198,7 @@ static void idct_put_altivec(uint8_t *dest, int stride, int16_t *blk) COPY(dest, vx7); } -static void idct_add_altivec(uint8_t *dest, int stride, int16_t *blk) +static void idct_add_altivec(uint8_t *dest, ptrdiff_t stride, int16_t *blk) { vec_s16 *block = (vec_s16 *) blk; vec_u8 tmp; diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c index 35bb280842..83d537f0c1 100644 --- a/libavcodec/ppc/vc1dsp_altivec.c +++ b/libavcodec/ppc/vc1dsp_altivec.c @@ -229,7 +229,8 @@ static void vc1_inv_trans_8x8_altivec(int16_t block[64]) /** Do inverse transform on 8x4 part of block */ -static void vc1_inv_trans_8x4_altivec(uint8_t *dest, int stride, int16_t *block) +static void vc1_inv_trans_8x4_altivec(uint8_t *dest, ptrdiff_t stride, + int16_t *block) { vector signed short src0, src1, src2, src3, src4, src5, src6, src7; vector signed int s0, s1, s2, s3, s4, s5, s6, s7; |