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/x86 | |
| 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/x86')
| -rw-r--r-- | libavcodec/x86/rv34dsp_init.c | 4 | ||||
| -rw-r--r-- | libavcodec/x86/rv40dsp_init.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c index f3d2e172e7..38831255c9 100644 --- a/libavcodec/x86/rv34dsp_init.c +++ b/libavcodec/x86/rv34dsp_init.c @@ -26,8 +26,8 @@ void ff_rv34_idct_dc_mmx2(DCTELEM *block); void ff_rv34_idct_dc_noround_mmx2(DCTELEM *block); -void ff_rv34_idct_dc_add_mmx(uint8_t *dst, int stride, int dc); -void ff_rv34_idct_dc_add_sse4(uint8_t *dst, int stride, int dc); +void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc); +void ff_rv34_idct_dc_add_sse4(uint8_t *dst, ptrdiff_t stride, int dc); av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp) { diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 3d6c6f0fa0..79c70f78c3 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -42,9 +42,9 @@ void ff_avg_rv40_chroma_mc4_3dnow(uint8_t *dst, uint8_t *src, #define DECLARE_WEIGHT(opt) \ void ff_rv40_weight_func_16_##opt(uint8_t *dst, uint8_t *src1, uint8_t *src2, \ - int w1, int w2, int stride); \ + int w1, int w2, ptrdiff_t stride); \ void ff_rv40_weight_func_8_##opt (uint8_t *dst, uint8_t *src1, uint8_t *src2, \ - int w1, int w2, int stride); + int w1, int w2, ptrdiff_t stride); DECLARE_WEIGHT(mmx) DECLARE_WEIGHT(sse2) DECLARE_WEIGHT(ssse3) |