From f3001e0deeacbfb0966b5d59bb1e0318f0eee4fc Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 7 Nov 2009 20:10:02 +0000
Subject: Simpliy exp*table init, based on patch by reimar.

Originally committed as revision 20470 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/mpegaudio_tablegen.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'libavcodec/mpegaudio_tablegen.h')

diff --git a/libavcodec/mpegaudio_tablegen.h b/libavcodec/mpegaudio_tablegen.h
index 362c30b4be..9c9ab49665 100644
--- a/libavcodec/mpegaudio_tablegen.h
+++ b/libavcodec/mpegaudio_tablegen.h
@@ -40,7 +40,7 @@ static uint32_t expval_table[512][16];
 
 static void mpegaudio_tableinit(void)
 {
-    int i;
+    int i, value, exponent;
     for(i=1;i<TABLE_4_3_SIZE;i++) {
         double value = i/4;
         double f, fm;
@@ -54,13 +54,13 @@ static void mpegaudio_tableinit(void)
         table_4_3_value[i] = m;
         table_4_3_exp[i] = -e;
     }
-    for(i=0; i<512*16; i++){
-        double value = i & 15;
-        int exponent= (i>>4);
-        double f= value * cbrtf(value) * pow(2, (exponent-400)*0.25 + FRAC_BITS + 5);
-        expval_table[exponent][i&15]= llrint(f);
-        if((i&15)==1)
-            exp_table[exponent]= llrint(f);
+    for(exponent=0; exponent<512; exponent++) {
+        for(value=0; value<16; value++) {
+            int i= value + 16*exponent;
+            double f= (double)value * cbrtf(value) * pow(2, (exponent-400)*0.25 + FRAC_BITS + 5);
+            expval_table[exponent][value]= llrint(f);
+        }
+        exp_table[exponent]= expval_table[exponent][1];
     }
 }
 #endif /* CONFIG_HARDCODED_TABLES */
-- 
cgit v1.2.3