From: Andre Noll <maan@systemlinux.org>
Date: Fri, 16 Oct 2009 19:46:13 +0000 (+0200)
Subject: simplify definition of sqrthalf and capitalize it.
X-Git-Tag: v0.4.1~96
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=acebb60a3709eebbfed30dc47c1f324969e4d7c7

simplify definition of sqrthalf and capitalize it.
---

diff --git a/imdct.c b/imdct.c
index 61498f73..a981eeb9 100644
--- a/imdct.c
+++ b/imdct.c
@@ -29,8 +29,6 @@
 
 typedef float fftsample_t;
 
-#define M_SQRT1_2      0.70710678118654752440	/* 1/sqrt(2) */
-
 struct fft_complex {
 	fftsample_t re, im;
 };
@@ -89,7 +87,7 @@ static int split_radix_permutation(int i, int n, int inverse)
 		return split_radix_permutation(i, m, inverse) * 4 - 1;
 }
 
-#define sqrthalf (float)M_SQRT1_2
+#define SQRTHALF (float)0.70710678118654752440	/* 1/sqrt(2) */
 
 #define BF(x,y,a,b) {\
     x = a - b;\
@@ -199,7 +197,7 @@ static void fft8(struct fft_complex *z)
 	BF(z[6].re, z[2].re, z[2].re, t7);
 	BF(z[6].im, z[2].im, z[2].im, t8);
 
-	TRANSFORM(z[1], z[3], z[5], z[7], sqrthalf, sqrthalf);
+	TRANSFORM(z[1], z[3], z[5], z[7], SQRTHALF, SQRTHALF);
 }
 
 static void fft16(struct fft_complex *z)
@@ -211,7 +209,7 @@ static void fft16(struct fft_complex *z)
 	fft4(z + 12);
 
 	TRANSFORM_ZERO(z[0], z[4], z[8], z[12]);
-	TRANSFORM(z[2], z[6], z[10], z[14], sqrthalf, sqrthalf);
+	TRANSFORM(z[2], z[6], z[10], z[14], SQRTHALF, SQRTHALF);
 	TRANSFORM(z[1], z[5], z[9], z[13], ff_cos_16[1], ff_cos_16[3]);
 	TRANSFORM(z[3], z[7], z[11], z[15], ff_cos_16[3], ff_cos_16[1]);
 }
@@ -333,7 +331,6 @@ static int fft_init(struct fft_context *s, int nbits, int inverse)
 	s->exptab = para_malloc((n / 2) * sizeof(struct fft_complex));
 	s->revtab = para_malloc(n * sizeof(uint16_t));
 	s->inverse = inverse;
-
 	for (j = 4; j <= nbits; j++) {
 		int k = 1 << j;
 		double freq = 2 * M_PI / k;