Index: /libmpc/branches/r2d/libmpcenc/quant.c
===================================================================
--- /libmpc/branches/r2d/libmpcenc/quant.c	(revision 158)
+++ /libmpc/branches/r2d/libmpcenc/quant.c	(revision 159)
@@ -163,13 +163,13 @@
     float  signal = 1.e-30f;
     float  error = 1.e-30f;
-    float  sig, err;
+    float  err, sig;
 
     // Summation of the absolute power and the quadratic error
     for ( k = 0; k < 36; k++ ) {
-        err = input[k] * NoiseInjectionCompensation1D [res];
-		sig = mpc_nearbyintf(err * fac) * invfac - err;
-
-        error += sig * sig;
-        signal += err * err;
+        sig = input[k] * NoiseInjectionCompensation1D [res];
+		err = mpc_nearbyintf(sig * fac) * invfac - sig;
+
+        error += err * err;
+        signal += sig * sig;
     }
 
@@ -185,5 +185,5 @@
     float  fac    = A [res];
     float  invfac = C [res];
-	float  signal, error, ret, sig, err;
+	float  signal, error, ret, err, sig;
 
     // Summation of the absolute power and the quadratic error
@@ -191,33 +191,33 @@
 	signal = error = 1.e-30f;
     for ( ; k < 12; k++ ) {
-        err = input[k] * NoiseInjectionCompensation1D [res];
-		sig = mpc_nearbyintf(err * fac) * invfac - err;
-
-        error += sig * sig;
-        signal += err * err;
-    }
-    sig = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
-    ret = sig;
+        sig = input[k] * NoiseInjectionCompensation1D [res];
+		err = mpc_nearbyintf(sig * fac) * invfac - sig;
+
+        error += err * err;
+        signal += sig * sig;
+    }
+    err = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
+    ret = err;
     signal = error = 1.e-30f;
     for ( ; k < 24; k++ ) {
-        err = input[k] * NoiseInjectionCompensation1D [res];
-		sig = mpc_nearbyintf(err * fac) * invfac - err;
-
-        error += sig * sig;
-        signal += err * err;
-    }
-    sig = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
-	ret = maxf(ret, sig);
+        sig = input[k] * NoiseInjectionCompensation1D [res];
+		err = mpc_nearbyintf(sig * fac) * invfac - sig;
+
+        error += err * err;
+        signal += sig * sig;
+    }
+    err = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
+	ret = maxf(ret, err);
 
     signal = error = 1.e-30f;
     for ( ; k < 36; k++ ) {
-        err = input[k] * NoiseInjectionCompensation1D [res];
-		sig = mpc_nearbyintf(err * fac) * invfac - err;
-
-        error += sig * sig;
-        signal += err * err;
-    }
-    sig = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
-	ret = maxf(ret, sig);
+        sig = input[k] * NoiseInjectionCompensation1D [res];
+		err = mpc_nearbyintf(sig * fac) * invfac - sig;
+
+        error += err * err;
+        signal += sig * sig;
+    }
+    err = signal > error  ?  error / (SNRcomp * signal)  :  error / signal;
+	ret = maxf(ret, err);
 
     return ret;