diff options
| -rw-r--r-- | libavcodec/arm/vorbisdsp_init_arm.c | 3 | ||||
| -rw-r--r-- | libavcodec/ppc/vorbisdsp_altivec.c | 2 | ||||
| -rw-r--r-- | libavcodec/vorbis.h | 2 | ||||
| -rw-r--r-- | libavcodec/vorbisdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/vorbisdsp.h | 5 | ||||
| -rw-r--r-- | libavcodec/x86/vorbisdsp_init.c | 6 |
6 files changed, 13 insertions, 7 deletions
diff --git a/libavcodec/arm/vorbisdsp_init_arm.c b/libavcodec/arm/vorbisdsp_init_arm.c index ec8fbd5bc9..8c88cc5404 100644 --- a/libavcodec/arm/vorbisdsp_init_arm.c +++ b/libavcodec/arm/vorbisdsp_init_arm.c @@ -24,7 +24,8 @@ #include "libavutil/arm/cpu.h" #include "libavcodec/vorbisdsp.h" -void ff_vorbis_inverse_coupling_neon(float *mag, float *ang, int blocksize); +void ff_vorbis_inverse_coupling_neon(float *mag, float *ang, + intptr_t blocksize); void ff_vorbisdsp_init_arm(VorbisDSPContext *c) { diff --git a/libavcodec/ppc/vorbisdsp_altivec.c b/libavcodec/ppc/vorbisdsp_altivec.c index 07c232430f..d6b961c6e9 100644 --- a/libavcodec/ppc/vorbisdsp_altivec.c +++ b/libavcodec/ppc/vorbisdsp_altivec.c @@ -27,7 +27,7 @@ #if HAVE_ALTIVEC static void vorbis_inverse_coupling_altivec(float *mag, float *ang, - int blocksize) + intptr_t blocksize) { int i; vector float m, a; diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h index 6b72f6ad7e..e4d7dd4847 100644 --- a/libavcodec/vorbis.h +++ b/libavcodec/vorbis.h @@ -43,7 +43,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num); void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values, uint16_t *y_list, int *flag, int multiplier, float * out, int samples); -void ff_vorbis_inverse_coupling(float *mag, float *ang, int blocksize); +void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize); #define ilog(i) av_log2(2*(i)) diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 6b75ae393a..791314e9fc 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1450,7 +1450,7 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, } } -void ff_vorbis_inverse_coupling(float *mag, float *ang, int blocksize) +void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize) { int i; for (i = 0; i < blocksize; i++) { diff --git a/libavcodec/vorbisdsp.h b/libavcodec/vorbisdsp.h index b6b2f29fd8..32fcfef5b0 100644 --- a/libavcodec/vorbisdsp.h +++ b/libavcodec/vorbisdsp.h @@ -19,9 +19,12 @@ #ifndef AVCODEC_VORBISDSP_H #define AVCODEC_VORBISDSP_H +#include <stdint.h> + typedef struct VorbisDSPContext { /* assume len is a multiple of 4, and arrays are 16-byte aligned */ - void (*vorbis_inverse_coupling)(float *mag, float *ang, int blocksize); + void (*vorbis_inverse_coupling)(float *mag, float *ang, + intptr_t blocksize); } VorbisDSPContext; void ff_vorbisdsp_init(VorbisDSPContext *dsp); diff --git a/libavcodec/x86/vorbisdsp_init.c b/libavcodec/x86/vorbisdsp_init.c index 5243095003..6f86f6720d 100644 --- a/libavcodec/x86/vorbisdsp_init.c +++ b/libavcodec/x86/vorbisdsp_init.c @@ -25,7 +25,8 @@ #if HAVE_INLINE_ASM #if ARCH_X86_32 -static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize) +static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, + intptr_t blocksize) { int i; __asm__ volatile ("pxor %%mm7, %%mm7":); @@ -54,7 +55,8 @@ static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize) } #endif -static void vorbis_inverse_coupling_sse(float *mag, float *ang, int blocksize) +static void vorbis_inverse_coupling_sse(float *mag, float *ang, + intptr_t blocksize) { int i; |