Merge commit '317cfaa5e09755ed0b34af512ec687963a67bdbf'

[ffmpeg] / libavcodec / aacps.c

diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c
index bf6047594b3fcd605d5e90c29701d766d0e8f94b..1165d9be3f3a71aea9a43abe42410c449a098473 100644 (file)
--- a/libavcodec/aacps.c
+++ b/libavcodec/aacps.c
@@ -670,7 +670,7 @@ static void decorrelation(PSContext *ps, INTFLOAT (*out)[32][2], const INTFLOAT
     const int8_t *k_to_i = is34 ? k_to_i_34 : k_to_i_20;
     int i, k, m, n;
     int n0 = 0, nL = 32;
-    const INTFLOAT peak_decay_factor = Q31(0.76592833836465f);;
+    const INTFLOAT peak_decay_factor = Q31(0.76592833836465f);
 
     memset(power, 0, 34 * sizeof(*power));
 
@@ -936,8 +936,8 @@ static void stereo_processing(PSContext *ps, INTFLOAT (*l)[32][2], INTFLOAT (*r)
             H22[0][e+1][b] = h22;
         }
         for (k = 0; k < NR_BANDS[is34]; k++) {
-            INTFLOAT h[2][4];
-            INTFLOAT h_step[2][4];
+            LOCAL_ALIGNED_16(INTFLOAT, h, [2], [4]);
+            LOCAL_ALIGNED_16(INTFLOAT, h_step, [2], [4]);
             int start = ps->border_position[e];
             int stop  = ps->border_position[e+1];
             INTFLOAT width = Q30(1.f) / (stop - start);