diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-08-24 00:18:41 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-08-26 11:48:15 +0200 |
| commit | f81be06cf614919d71ded29b8f595bef40123ad8 (patch) | |
| tree | ceb598521b4b3b061ddcb92547e2e54b430e0a24 /libavcodec/cavs.c | |
| parent | 802727b538b484e3f9d1345bfcc4ab24cfea8898 (diff) | |
| download | ffmpeg-f81be06cf614919d71ded29b8f595bef40123ad8.tar.gz | |
cavs: Change type of stride parameters to ptrdiff_t
ptrdiff_t is the correct type for array strides and similar.
Diffstat (limited to 'libavcodec/cavs.c')
| -rw-r--r-- | libavcodec/cavs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 3050b9adc5..cf66629ffd 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -246,7 +246,7 @@ void ff_cavs_load_intra_pred_chroma(AVSContext *h) } } -static void intra_pred_vert(uint8_t *d, uint8_t *top, uint8_t *left, int stride) +static void intra_pred_vert(uint8_t *d, uint8_t *top, uint8_t *left, ptrdiff_t stride) { int y; uint64_t a = AV_RN64(&top[1]); @@ -254,7 +254,7 @@ static void intra_pred_vert(uint8_t *d, uint8_t *top, uint8_t *left, int stride) *((uint64_t *)(d + y * stride)) = a; } -static void intra_pred_horiz(uint8_t *d, uint8_t *top, uint8_t *left, int stride) +static void intra_pred_horiz(uint8_t *d, uint8_t *top, uint8_t *left, ptrdiff_t stride) { int y; uint64_t a; @@ -264,7 +264,7 @@ static void intra_pred_horiz(uint8_t *d, uint8_t *top, uint8_t *left, int stride } } -static void intra_pred_dc_128(uint8_t *d, uint8_t *top, uint8_t *left, int stride) +static void intra_pred_dc_128(uint8_t *d, uint8_t *top, uint8_t *left, ptrdiff_t stride) { int y; uint64_t a = 0x8080808080808080ULL; @@ -272,7 +272,7 @@ static void intra_pred_dc_128(uint8_t *d, uint8_t *top, uint8_t *left, int strid *((uint64_t *)(d + y * stride)) = a; } -static void intra_pred_plane(uint8_t *d, uint8_t *top, uint8_t *left, int stride) +static void intra_pred_plane(uint8_t *d, uint8_t *top, uint8_t *left, ptrdiff_t stride) { int x, y, ia; int ih = 0; @@ -294,7 +294,7 @@ static void intra_pred_plane(uint8_t *d, uint8_t *top, uint8_t *left, int stride #define LOWPASS(ARRAY, INDEX) \ ((ARRAY[(INDEX) - 1] + 2 * ARRAY[(INDEX)] + ARRAY[(INDEX) + 1] + 2) >> 2) -static void intra_pred_lp(uint8_t *d, uint8_t *top, uint8_t *left, int stride) +static void intra_pred_lp(uint8_t *d, uint8_t *top, uint8_t *left, ptrdiff_t stride) { int x, y; for (y = 0; y < 8; y++) @@ -302,7 +302,7 @@ static void intra_pred_lp(uint8_t *d, uint8_t *top, uint8_t *left, int stride) d[y * stride + x] = (LOWPASS(top, x + 1) + LOWPASS(left, y + 1)) >> 1; } -static void intra_pred_down_left(uint8_t *d, uint8_t *top, uint8_t *left, int stride) +static void intra_pred_down_left(uint8_t *d, uint8_t *top, uint8_t *left, ptrdiff_t stride) { int x, y; for (y = 0; y < 8; y++) @@ -310,7 +310,7 @@ static void intra_pred_down_left(uint8_t *d, uint8_t *top, uint8_t *left, int st d[y * stride + x] = (LOWPASS(top, x + y + 2) + LOWPASS(left, x + y + 2)) >> 1; } -static void intra_pred_down_right(uint8_t *d, uint8_t *top, uint8_t *left, int stride) +static void intra_pred_down_right(uint8_t *d, uint8_t *top, uint8_t *left, ptrdiff_t stride) { int x, y; for (y = 0; y < 8; y++) @@ -323,7 +323,7 @@ static void intra_pred_down_right(uint8_t *d, uint8_t *top, uint8_t *left, int s d[y * stride + x] = LOWPASS(left, y - x); } -static void intra_pred_lp_left(uint8_t *d, uint8_t *top, uint8_t *left, int stride) +static void intra_pred_lp_left(uint8_t *d, uint8_t *top, uint8_t *left, ptrdiff_t stride) { int x, y; for (y = 0; y < 8; y++) @@ -331,7 +331,7 @@ static void intra_pred_lp_left(uint8_t *d, uint8_t *top, uint8_t *left, int stri d[y * stride + x] = LOWPASS(left, y + 1); } -static void intra_pred_lp_top(uint8_t *d, uint8_t *top, uint8_t *left, int stride) +static void intra_pred_lp_top(uint8_t *d, uint8_t *top, uint8_t *left, ptrdiff_t stride) { int x, y; for (y = 0; y < 8; y++) |