SBR DSP: use intptr_t for the ixh parameter.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

diff --git a/libavcodec/arm/sbrdsp_init_arm.c b/libavcodec/arm/sbrdsp_init_arm.c
index 2ab0df8..04294cc 100644 (file)
--- 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],
 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);
 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 2711e71..aef894a 100644 (file)
--- 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],
 }
 
 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;
 
 {
     int m;
 

diff --git a/libavcodec/sbrdsp.h b/libavcodec/sbrdsp.h
index 88285b0..ee5d5a0 100644 (file)
--- a/libavcodec/sbrdsp.h
+++ b/libavcodec/sbrdsp.h
@@ -21,6 +21,8 @@
 #ifndef LIBAVCODEC_SBRDSP_H
 #define LIBAVCODEC_SBRDSP_H
 
 #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);
 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 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);
     void (*hf_apply_noise[4])(float (*Y)[2], const float *s_m,
                               const float *q_filt, int noise,
                               int kx, int m_max);