diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-08-23 23:23:45 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-08-26 11:36:26 +0200 |
| commit | d9d26a3674f31f482f54e936fcb382160830877a (patch) | |
| tree | 027c2a1b7b9258c64f255b37a1ca00889388caf6 /libavcodec/vp6.c | |
| parent | 6892df9294d93322d43255ada299507465bc93c8 (diff) | |
vp56: Change type of stride parameters to ptrdiff_t
This avoids SIMD-optimized functions having to sign-extend their
line size argument manually to be able to do pointer arithmetic.
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 c48c2b8180..aa0d09effb 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -514,7 +514,7 @@ static void vp6_parse_coeff(VP56Context *s) } } -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; @@ -529,7 +529,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; @@ -547,7 +547,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); @@ -555,7 +555,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; |