diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-20 13:47:29 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-20 15:58:32 +0100 |
| commit | e07fa3008bcafc027e9aa654657bae1f1ac64f5d (patch) | |
| tree | fdc9dc3b4e4565b2a7b4a27a0ccbe77ab65e22b0 /libavcodec/ppc/pixblockdsp.c | |
| parent | ce818d90bdb28d8591e6b81e020d1e7f87536649 (diff) | |
| parent | de452e503734ebb0fdbce86e9d16693b3530fad3 (diff) | |
| download | ffmpeg-e07fa3008bcafc027e9aa654657bae1f1ac64f5d.tar.gz | |
Merge commit 'de452e503734ebb0fdbce86e9d16693b3530fad3'
* commit 'de452e503734ebb0fdbce86e9d16693b3530fad3':
pixblockdsp: Change type of stride parameters to ptrdiff_t
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/ppc/pixblockdsp.c')
| -rw-r--r-- | libavcodec/ppc/pixblockdsp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/ppc/pixblockdsp.c b/libavcodec/ppc/pixblockdsp.c index f3a5050469..f5ac8509f0 100644 --- a/libavcodec/ppc/pixblockdsp.c +++ b/libavcodec/ppc/pixblockdsp.c @@ -37,7 +37,7 @@ #if HAVE_VSX static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels, - ptrdiff_t line_size) + ptrdiff_t stride) { int i; vector unsigned char perm = @@ -59,12 +59,12 @@ static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels, // Save the data to the block, we assume the block is 16-byte aligned. vec_vsx_st(shorts, i * 16, (vector signed short *) block); - pixels += line_size; + pixels += stride; } } #else static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels, - ptrdiff_t line_size) + ptrdiff_t stride) { int i; const vec_u8 zero = (const vec_u8)vec_splat_u8(0); @@ -84,7 +84,7 @@ static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels, // Save the data to the block, we assume the block is 16-byte aligned. vec_st(shorts, i * 16, (vec_s16 *)block); - pixels += line_size; + pixels += stride; } } @@ -92,7 +92,7 @@ static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels, #if HAVE_VSX static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1, - const uint8_t *s2, int stride) + const uint8_t *s2, ptrdiff_t stride) { int i; const vector unsigned char zero = @@ -154,7 +154,7 @@ static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1, } #else static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1, - const uint8_t *s2, int stride) + const uint8_t *s2, ptrdiff_t stride) { int i; vec_u8 perm; @@ -233,7 +233,7 @@ static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1, #if HAVE_VSX static void get_pixels_vsx(int16_t *restrict block, const uint8_t *pixels, - ptrdiff_t line_size) + ptrdiff_t stride) { int i; for (i = 0; i < 8; i++) { @@ -241,12 +241,12 @@ static void get_pixels_vsx(int16_t *restrict block, const uint8_t *pixels, vec_vsx_st(shorts, i * 16, block); - pixels += line_size; + pixels += stride; } } static void diff_pixels_vsx(int16_t *restrict block, const uint8_t *s1, - const uint8_t *s2, int stride) + const uint8_t *s2, ptrdiff_t stride) { int i; vec_s16 shorts1, shorts2; |