diff options
| author | Christophe GISQUET <christophe.gisquet@gmail.com> | 2012-02-23 22:25:48 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-23 15:48:40 -0800 |
| commit | 2e74a5abc2fda6cfbc86589852d6194d502332cb (patch) | |
| tree | 56d646c92e61cbcff4f6b1f08b2f6bd444731d46 | |
| parent | 31632e73f47d25e2077fce729571259ee6354854 (diff) | |
| download | ffmpeg-2e74a5abc2fda6cfbc86589852d6194d502332cb.tar.gz | |
SBR DSP: use intptr_t for the ixh parameter.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| -rw-r--r-- | libavcodec/arm/sbrdsp_init_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/sbrdsp.c | 2 | ||||
| -rw-r--r-- | libavcodec/sbrdsp.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/arm/sbrdsp_init_arm.c b/libavcodec/arm/sbrdsp_init_arm.c index 2ab0df829d..04294cc401 100644 --- a/libavcodec/arm/sbrdsp_init_arm.c +++ b/libavcodec/arm/sbrdsp_init_arm.c @@ -30,7 +30,7 @@ void ff_sbr_qmf_post_shuffle_neon(float W[32][2], const float *z); void ff_sbr_qmf_deint_neg_neon(float *v, const float *src); void ff_sbr_qmf_deint_bfly_neon(float *v, const float *src0, const float *src1); void ff_sbr_hf_g_filt_neon(float (*Y)[2], const float (*X_high)[40][2], - const float *g_filt, int m_max, int ixh); + const float *g_filt, int m_max, intptr_t ixh); void ff_sbr_hf_gen_neon(float (*X_high)[2], const float (*X_low)[2], const float alpha0[2], const float alpha1[2], float bw, int start, int end); diff --git a/libavcodec/sbrdsp.c b/libavcodec/sbrdsp.c index 2711e71338..aef894a51d 100644 --- a/libavcodec/sbrdsp.c +++ b/libavcodec/sbrdsp.c @@ -151,7 +151,7 @@ static void sbr_hf_gen_c(float (*X_high)[2], const float (*X_low)[2], } static void sbr_hf_g_filt_c(float (*Y)[2], const float (*X_high)[40][2], - const float *g_filt, int m_max, int ixh) + const float *g_filt, int m_max, intptr_t ixh) { int m; diff --git a/libavcodec/sbrdsp.h b/libavcodec/sbrdsp.h index 88285b07ec..ee5d5a0972 100644 --- a/libavcodec/sbrdsp.h +++ b/libavcodec/sbrdsp.h @@ -21,6 +21,8 @@ #ifndef LIBAVCODEC_SBRDSP_H #define LIBAVCODEC_SBRDSP_H +#include <stdint.h> + typedef struct SBRDSPContext { void (*sum64x5)(float *z); float (*sum_square)(float (*x)[2], int n); @@ -34,7 +36,7 @@ typedef struct SBRDSPContext { const float alpha0[2], const float alpha1[2], float bw, int start, int end); void (*hf_g_filt)(float (*Y)[2], const float (*X_high)[40][2], - const float *g_filt, int m_max, int ixh); + const float *g_filt, int m_max, intptr_t ixh); void (*hf_apply_noise[4])(float (*Y)[2], const float *s_m, const float *q_filt, int noise, int kx, int m_max); |