diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-21 15:19:17 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-21 15:19:17 +0100 |
| commit | 6d11b2f6567619cfa40b7e3809572818c7fc41b9 (patch) | |
| tree | 94a92e792bc55b0bc6336c0e0c0173ee4602491e /libavcodec/blockdsp.c | |
| parent | 6eb75e7d592d103618f8b3fa1d9385abadbef156 (diff) | |
| parent | b2939a75270bc7e971462648168aa3a2a48c1c8c (diff) | |
| download | ffmpeg-6d11b2f6567619cfa40b7e3809572818c7fc41b9.tar.gz | |
Merge commit 'b2939a75270bc7e971462648168aa3a2a48c1c8c'
* commit 'b2939a75270bc7e971462648168aa3a2a48c1c8c':
blockdsp: Change type of array stride parameters to ptrdiff_t
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/blockdsp.c')
| -rw-r--r-- | libavcodec/blockdsp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c index a5c527a4da..c7efe7e77b 100644 --- a/libavcodec/blockdsp.c +++ b/libavcodec/blockdsp.c @@ -35,7 +35,8 @@ static void clear_blocks_c(int16_t *blocks) memset(blocks, 0, sizeof(int16_t) * 6 * 64); } -static void fill_block16_c(uint8_t *block, uint8_t value, int line_size, int h) +static void fill_block16_c(uint8_t *block, uint8_t value, ptrdiff_t line_size, + int h) { int i; @@ -45,7 +46,8 @@ static void fill_block16_c(uint8_t *block, uint8_t value, int line_size, int h) } } -static void fill_block8_c(uint8_t *block, uint8_t value, int line_size, int h) +static void fill_block8_c(uint8_t *block, uint8_t value, ptrdiff_t line_size, + int h) { int i; |