dvbsubdec: Fix function return type

[ffmpeg] / libavcodec / aacpsdsp.c

diff --git a/libavcodec/aacpsdsp.c b/libavcodec/aacpsdsp.c
index 3d9eb61fd6277a8d78ab672c8cfd48134794bec5..88e731f92579eae8a799fa505d48bf78e48da8f8 100644 (file)
--- a/libavcodec/aacpsdsp.c
+++ b/libavcodec/aacpsdsp.c
@@ -40,7 +40,7 @@ static void ps_mul_pair_single_c(float (*dst)[2], float (*src0)[2], float *src1,
 }
 
 static void ps_hybrid_analysis_c(float (*out)[2], float (*in)[2],
-                                 const float (*filter)[7][2],
+                                 const float (*filter)[8][2],
                                  int stride, int n)
 {
     int i, j;
@@ -93,7 +93,7 @@ static void ps_hybrid_synthesis_deint_c(float out[2][38][64],
 
 static void ps_decorrelate_c(float (*out)[2], float (*delay)[2],
                              float (*ap_delay)[PS_QMF_TIME_SLOTS + PS_MAX_AP_DELAY][2],
-                             const float phi_fract[2], float (*Q_fract)[2],
+                             const float phi_fract[2], const float (*Q_fract)[2],
                              const float *transient_gain,
                              float g_decay_slope,
                              int len)
@@ -208,4 +208,7 @@ av_cold void ff_psdsp_init(PSDSPContext *s)
     s->decorrelate            = ps_decorrelate_c;
     s->stereo_interpolate[0]  = ps_stereo_interpolate_c;
     s->stereo_interpolate[1]  = ps_stereo_interpolate_ipdopd_c;
+
+    if (ARCH_ARM)
+        ff_psdsp_init_arm(s);
 }