diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-16 22:04:14 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-20 14:58:25 -0800 |
| commit | 3ab9a2a5577d445252724af4067d2a7c8a378efa (patch) | |
| tree | 8c0b8f83376754549ca57b1e027571342173966a /libavcodec/arm | |
| parent | 770a5c6d025e9c8eb3f5aba9cf1d7d7938fb918a (diff) | |
| download | ffmpeg-3ab9a2a5577d445252724af4067d2a7c8a378efa.tar.gz | |
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.
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/rv34dsp_init_neon.c | 4 | ||||
| -rw-r--r-- | libavcodec/arm/rv40dsp_init_neon.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/arm/rv34dsp_init_neon.c b/libavcodec/arm/rv34dsp_init_neon.c index 744818cee3..b4a2f01f95 100644 --- a/libavcodec/arm/rv34dsp_init_neon.c +++ b/libavcodec/arm/rv34dsp_init_neon.c @@ -27,8 +27,8 @@ void ff_rv34_inv_transform_noround_neon(DCTELEM *block); void ff_rv34_inv_transform_noround_dc_neon(DCTELEM *block); -void ff_rv34_idct_add_neon(uint8_t *dst, int stride, DCTELEM *block); -void ff_rv34_idct_dc_add_neon(uint8_t *dst, int stride, int dc); +void ff_rv34_idct_add_neon(uint8_t *dst, ptrdiff_t stride, DCTELEM *block); +void ff_rv34_idct_dc_add_neon(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34dsp_init_neon(RV34DSPContext *c, DSPContext* dsp) { diff --git a/libavcodec/arm/rv40dsp_init_neon.c b/libavcodec/arm/rv40dsp_init_neon.c index 898b841344..650ef61878 100644 --- a/libavcodec/arm/rv40dsp_init_neon.c +++ b/libavcodec/arm/rv40dsp_init_neon.c @@ -51,20 +51,20 @@ void ff_put_rv40_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int); void ff_avg_rv40_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int); void ff_avg_rv40_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int); -void ff_rv40_weight_func_16_neon(uint8_t *, uint8_t *, uint8_t *, int, int, int); -void ff_rv40_weight_func_8_neon(uint8_t *, uint8_t *, uint8_t *, int, int, int); +void ff_rv40_weight_func_16_neon(uint8_t *, uint8_t *, uint8_t *, int, int, ptrdiff_t); +void ff_rv40_weight_func_8_neon(uint8_t *, uint8_t *, uint8_t *, int, int, ptrdiff_t); -int ff_rv40_h_loop_filter_strength_neon(uint8_t *src, int stride, +int ff_rv40_h_loop_filter_strength_neon(uint8_t *src, ptrdiff_t stride, int beta, int beta2, int edge, int *p1, int *q1); -int ff_rv40_v_loop_filter_strength_neon(uint8_t *src, int stride, +int ff_rv40_v_loop_filter_strength_neon(uint8_t *src, ptrdiff_t stride, int beta, int beta2, int edge, int *p1, int *q1); -void ff_rv40_h_weak_loop_filter_neon(uint8_t *src, int stride, int filter_p1, +void ff_rv40_h_weak_loop_filter_neon(uint8_t *src, ptrdiff_t stride, int filter_p1, int filter_q1, int alpha, int beta, int lim_p0q0, int lim_q1, int lim_p1); -void ff_rv40_v_weak_loop_filter_neon(uint8_t *src, int stride, int filter_p1, +void ff_rv40_v_weak_loop_filter_neon(uint8_t *src, ptrdiff_t stride, int filter_p1, int filter_q1, int alpha, int beta, int lim_p0q0, int lim_q1, int lim_p1); |