From 3ab9a2a5577d445252724af4067d2a7c8a378efa Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 16 Feb 2012 22:04:14 -0800 Subject: rv34: change most "int stride" into "ptrdiff_t stride". This prevents having to sign-extend on 64-bit systems with 32-bit ints, such as x86-64. Also fixes crashes on systems where we don't do it and arguments are not in registers, such as Win64 for all weight functions. --- libavcodec/rv34dsp.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libavcodec/rv34dsp.h') diff --git a/libavcodec/rv34dsp.h b/libavcodec/rv34dsp.h index fe8fcaa8dd..c70194cc20 100644 --- a/libavcodec/rv34dsp.h +++ b/libavcodec/rv34dsp.h @@ -32,24 +32,24 @@ typedef void (*rv40_weight_func)(uint8_t *dst/*align width (8 or 16)*/, uint8_t *src1/*align width (8 or 16)*/, uint8_t *src2/*align width (8 or 16)*/, - int w1, int w2, int stride); + int w1, int w2, ptrdiff_t stride); typedef void (*rv34_inv_transform_func)(DCTELEM *block); -typedef void (*rv34_idct_add_func)(uint8_t *dst, int stride, DCTELEM *block); -typedef void (*rv34_idct_dc_add_func)(uint8_t *dst, int stride, +typedef void (*rv34_idct_add_func)(uint8_t *dst, ptrdiff_t stride, DCTELEM *block); +typedef void (*rv34_idct_dc_add_func)(uint8_t *dst, ptrdiff_t stride, int dc); -typedef void (*rv40_weak_loop_filter_func)(uint8_t *src, int stride, +typedef void (*rv40_weak_loop_filter_func)(uint8_t *src, ptrdiff_t stride, int filter_p1, int filter_q1, int alpha, int beta, int lims, int lim_q1, int lim_p1); -typedef void (*rv40_strong_loop_filter_func)(uint8_t *src, int stride, +typedef void (*rv40_strong_loop_filter_func)(uint8_t *src, ptrdiff_t stride, int alpha, int lims, int dmode, int chroma); -typedef int (*rv40_loop_filter_strength_func)(uint8_t *src, int stride, +typedef int (*rv40_loop_filter_strength_func)(uint8_t *src, ptrdiff_t stride, int beta, int beta2, int edge, int *p1, int *q1); -- cgit v1.2.3