diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-19 14:54:25 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-19 14:54:25 -0300 |
| commit | 4004d33fcbbb93eaf57b5a5f8b2412b7807f094f (patch) | |
| tree | f32596facfa46be27ebdd99c4efe77e9b18df91d /libavcodec/vp6.c | |
| parent | 6a42a54b9de41d5eb1b246409e280c85194ed6ff (diff) | |
| parent | d9d26a3674f31f482f54e936fcb382160830877a (diff) | |
| download | ffmpeg-4004d33fcbbb93eaf57b5a5f8b2412b7807f094f.tar.gz | |
Merge commit 'd9d26a3674f31f482f54e936fcb382160830877a'
* commit 'd9d26a3674f31f482f54e936fcb382160830877a':
vp56: Change type of stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vp6.c')
| -rw-r--r-- | libavcodec/vp6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 4afd67b3a4..c7e8f13282 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -531,7 +531,7 @@ static int vp6_parse_coeff(VP56Context *s) return 0; } -static int vp6_block_variance(uint8_t *src, int stride) +static int vp6_block_variance(uint8_t *src, ptrdiff_t stride) { int sum = 0, square_sum = 0; int y, x; @@ -546,7 +546,7 @@ static int vp6_block_variance(uint8_t *src, int stride) return (16*square_sum - sum*sum) >> 8; } -static void vp6_filter_hv4(uint8_t *dst, uint8_t *src, int stride, +static void vp6_filter_hv4(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int delta, const int16_t *weights) { int x, y; @@ -564,7 +564,7 @@ static void vp6_filter_hv4(uint8_t *dst, uint8_t *src, int stride, } static void vp6_filter_diag2(VP56Context *s, uint8_t *dst, uint8_t *src, - int stride, int h_weight, int v_weight) + ptrdiff_t stride, int h_weight, int v_weight) { uint8_t *tmp = s->edge_emu_buffer+16; s->h264chroma.put_h264_chroma_pixels_tab[0](tmp, src, stride, 9, h_weight, 0); @@ -572,7 +572,7 @@ static void vp6_filter_diag2(VP56Context *s, uint8_t *dst, uint8_t *src, } static void vp6_filter(VP56Context *s, uint8_t *dst, uint8_t *src, - int offset1, int offset2, int stride, + int offset1, int offset2, ptrdiff_t stride, VP56mv mv, int mask, int select, int luma) { int filter4 = 0; |