diff options
author | James Almer <jamrial@gmail.com> | 2017-03-19 15:30:13 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-19 15:30:13 -0300 |
commit | 663640d745279a272398283d8dca7efa356c8fe8 (patch) | |
tree | 6a12837dd212c0d46423a5d7a77d6658136ebaa6 /libavcodec/proresdsp.c | |
parent | aec42ebc27c46625fb7fac9d5717056044ecac92 (diff) | |
parent | 3fd22538bc0e0de84b31335266b4b1577d3d609e (diff) | |
download | ffmpeg-663640d745279a272398283d8dca7efa356c8fe8.tar.gz |
Merge commit '3fd22538bc0e0de84b31335266b4b1577d3d609e'
* commit '3fd22538bc0e0de84b31335266b4b1577d3d609e':
prores: Change type of stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/proresdsp.c')
-rw-r--r-- | libavcodec/proresdsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index 82d6009b58..5b5ada21fe 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -36,11 +36,11 @@ /** * Add bias value, clamp and output pixels of a slice */ -static void put_pixels(uint16_t *dst, int stride, const int16_t *in) +static void put_pixels(uint16_t *dst, ptrdiff_t linesize, const int16_t *in) { int x, y, src_offset, dst_offset; - for (y = 0, dst_offset = 0; y < 8; y++, dst_offset += stride) { + for (y = 0, dst_offset = 0; y < 8; y++, dst_offset += linesize) { for (x = 0; x < 8; x++) { src_offset = (y << 3) + x; @@ -49,7 +49,7 @@ static void put_pixels(uint16_t *dst, int stride, const int16_t *in) } } -static void prores_idct_put_c(uint16_t *out, int linesize, int16_t *block, const int16_t *qmat) +static void prores_idct_put_c(uint16_t *out, ptrdiff_t linesize, int16_t *block, const int16_t *qmat) { ff_prores_idct(block, qmat); put_pixels(out, linesize >> 1, block); |