avcodec/ylc: Fix vlc of 31 bits

[ffmpeg] / libavcodec / aacpsdsp_template.c

diff --git a/libavcodec/aacpsdsp_template.c b/libavcodec/aacpsdsp_template.c
index 3049ce8b79e76393731a119b5e2d0978543f9aff..9e1a95c1a14a67c0648ac6587701c3332568ffbf 100644 (file)
--- a/libavcodec/aacpsdsp_template.c
+++ b/libavcodec/aacpsdsp_template.c
@@ -45,7 +45,7 @@ static void ps_mul_pair_single_c(INTFLOAT (*dst)[2], INTFLOAT (*src0)[2], INTFLO
 
 static void ps_hybrid_analysis_c(INTFLOAT (*out)[2], INTFLOAT (*in)[2],
                                  const INTFLOAT (*filter)[8][2],
-                                 int stride, int n)
+                                 ptrdiff_t stride, int n)
 {
     int i, j;
 
@@ -72,6 +72,7 @@ static void ps_hybrid_analysis_c(INTFLOAT (*out)[2], INTFLOAT (*in)[2],
 #endif /* USE_FIXED */
     }
 }
+
 static void ps_hybrid_analysis_ileave_c(INTFLOAT (*out)[32][2], INTFLOAT L[2][38][64],
                                       int i, int len)
 {
@@ -165,10 +166,10 @@ static void ps_stereo_interpolate_c(INTFLOAT (*l)[2], INTFLOAT (*r)[2],
         h1 += hs1;
         h2 += hs2;
         h3 += hs3;
-        l[n][0] = AAC_MADD30(h0,  l_re,  h2, r_re);
-        l[n][1] = AAC_MADD30(h0,  l_im,  h2,  r_im);
-        r[n][0] = AAC_MADD30(h1,  l_re,  h3,  r_re);
-        r[n][1] = AAC_MADD30(h1,  l_im,  h3,  r_im);
+        l[n][0] = AAC_MADD30(h0, l_re, h2, r_re);
+        l[n][1] = AAC_MADD30(h0, l_im, h2, r_im);
+        r[n][0] = AAC_MADD30(h1, l_re, h3, r_re);
+        r[n][1] = AAC_MADD30(h1, l_im, h3, r_im);
     }
 }
 
@@ -222,6 +223,8 @@ av_cold void AAC_RENAME(ff_psdsp_init)(PSDSPContext *s)
 #if !USE_FIXED
     if (ARCH_ARM)
         ff_psdsp_init_arm(s);
+    if (ARCH_AARCH64)
+        ff_psdsp_init_aarch64(s);
     if (ARCH_MIPS)
         ff_psdsp_init_mips(s);
     if (ARCH_X86)