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/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/pixblockdsp.c')
| -rw-r--r-- | libavcodec/pixblockdsp.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/pixblockdsp.c b/libavcodec/pixblockdsp.c index f0883d3d08..417c944e00 100644 --- a/libavcodec/pixblockdsp.c +++ b/libavcodec/pixblockdsp.c @@ -25,20 +25,20 @@ #include "pixblockdsp.h" static void get_pixels_16_c(int16_t *av_restrict block, const uint8_t *pixels, - ptrdiff_t line_size) + ptrdiff_t stride) { - AV_COPY128U(block + 0 * 8, pixels + 0 * line_size); - AV_COPY128U(block + 1 * 8, pixels + 1 * line_size); - AV_COPY128U(block + 2 * 8, pixels + 2 * line_size); - AV_COPY128U(block + 3 * 8, pixels + 3 * line_size); - AV_COPY128U(block + 4 * 8, pixels + 4 * line_size); - AV_COPY128U(block + 5 * 8, pixels + 5 * line_size); - AV_COPY128U(block + 6 * 8, pixels + 6 * line_size); - AV_COPY128U(block + 7 * 8, pixels + 7 * line_size); + AV_COPY128U(block + 0 * 8, pixels + 0 * stride); + AV_COPY128U(block + 1 * 8, pixels + 1 * stride); + AV_COPY128U(block + 2 * 8, pixels + 2 * stride); + AV_COPY128U(block + 3 * 8, pixels + 3 * stride); + AV_COPY128U(block + 4 * 8, pixels + 4 * stride); + AV_COPY128U(block + 5 * 8, pixels + 5 * stride); + AV_COPY128U(block + 6 * 8, pixels + 6 * stride); + AV_COPY128U(block + 7 * 8, pixels + 7 * stride); } static void get_pixels_8_c(int16_t *av_restrict block, const uint8_t *pixels, - ptrdiff_t line_size) + ptrdiff_t stride) { int i; @@ -52,13 +52,13 @@ static void get_pixels_8_c(int16_t *av_restrict block, const uint8_t *pixels, block[5] = pixels[5]; block[6] = pixels[6]; block[7] = pixels[7]; - pixels += line_size; + pixels += stride; block += 8; } } static void diff_pixels_c(int16_t *av_restrict block, const uint8_t *s1, - const uint8_t *s2, int stride) + const uint8_t *s2, ptrdiff_t stride) { int i; |