Yet more table renaming

Originally committed as revision 13827 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index a855d37..6448017 100644 (file)
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -130,7 +130,7 @@ static void add_wav(int n, int skip_first, int *m, const int16_t *s1,
 
     v[0] = 0;
     for (i=!skip_first; i<3; i++)
-        v[i] = (wavtable1[n][i] * m[i]) >> (wavtable2[n][i] + 1);
+        v[i] = (gain_val_tab[n][i] * m[i]) >> (gain_exp_tab[n][i] + 1);
 
     for (i=0; i < BLOCKSIZE; i++)
         dest[i] = ((*(s1++))*v[0] + (*(s2++))*v[1] + (*(s3++))*v[2]) >> 12;

diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h
index 5d0f120..54605ba 100644 (file)
--- a/libavcodec/ra144.h
+++ b/libavcodec/ra144.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 /* 14.4 data tables */
-static const int16_t wavtable1[256][9] = {
+static const int16_t gain_val_tab[256][9] = {
     { 541,   956,   768, -1011,  -811,  -717,  -571,  -893,  -576},
     { 877,   581,   568,  -997,  -975,  -646,  -752,  -661,  -632},
     { 675,   787,   635,  -519,  -838,  -977,  -890,  -605,  -789},
@@ -284,7 +284,7 @@ static const int16_t wavtable1[256][9] = {
     { 814,   744,   543,  -592,  -865,  -790,  -648,  -541,  -577}
 };
 
-static const uint8_t wavtable2[256][9] = {
+static const uint8_t gain_exp_tab[256][9] = {
     {14, 14, 14, 20, 20, 19, 21, 20, 20},
     {14, 14, 14, 20, 20, 20, 20, 21, 21},
     {14, 13, 14, 18, 20, 19, 21, 18, 21},