X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=imdct.c;h=d2a0681898b6497f2742e842d3b9ef1ed104621a;hp=3495e61181b1074a5223955d6d66d90381436fbe;hb=9cc91f2d8d746e77947eeb2fd7af711a43c3a56a;hpb=f113a41a633c0541f0d8418baf40205f4553c885

diff --git a/imdct.c b/imdct.c
index 3495e611..d2a06818 100644
--- a/imdct.c
+++ b/imdct.c
@@ -15,10 +15,7 @@
  * \file imdct.c Inverse modified discrete cosine transform.
  */
 
-#include <inttypes.h>
 #include <math.h>
-#include <string.h>
-#include <stdlib.h>
 #include <regex.h>
 
 #include "para.h"
@@ -58,8 +55,10 @@ struct mdct_context {
 	struct fft_context fft;
 };
 
-/** cos(2 * pi * x / n) for 0 <= x <= n / 4, followed by its reverse */
-#define COSINE_TAB(n) fftsample_t cos_ ## n[n / 2] __aligned(16)
+/** \cond cosine_tabs */
+
+/* cos(2 * pi * x / n) for 0 <= x <= n / 4, followed by its reverse */
+#define COSINE_TAB(n) static fftsample_t cos_ ## n[n / 2] __a_aligned(16)
 
 COSINE_TAB(16);
 COSINE_TAB(32);
@@ -79,8 +78,9 @@ static fftsample_t *cos_tabs[] = {
 	cos_16, cos_32, cos_64, cos_128, cos_256, cos_512, cos_1024, cos_2048,
 	cos_4096, cos_8192, cos_16384, cos_32768, cos_65536,
 };
+/** \endcond cosine_tabs */
 
-static int split_radix_permutation(int i, int n)
+__a_const static int split_radix_permutation(int i, int n)
 {
 	int m;
 	if (n <= 2)
@@ -293,7 +293,6 @@ static void imdct_half(struct mdct_context *s, fftsample_t *output,
 	fft(&s->fft, z);
 
 	/* post rotation + reordering */
-	output += n4;
 	for (k = 0; k < n8; k++) {
 		fftsample_t r0, i0, r1, i1;
 		CMUL(r0, i1, z[n8 - k - 1].im, z[n8 - k - 1].re,