From: Martin Storsjö <martin@martin.st>
Date: Tue, 21 Dec 2010 09:03:57 +0000 (+0000)
Subject: g722: Move the low_inv_quant6 table up to the common tables
X-Git-Tag: v0.7b1~1286
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8bd1956462e862315a78ca6442c5b54c5dd1f826;p=platform%2Fupstream%2Flibav.git

g722: Move the low_inv_quant6 table up to the common tables

Since SVN rev 25866, this table is used by the trellis encoder, too,
not only by the decoder.

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

diff --git a/libavcodec/g722.c b/libavcodec/g722.c
index a05e8ca..96a2bd6 100644
--- a/libavcodec/g722.c
+++ b/libavcodec/g722.c
@@ -98,6 +98,16 @@ static const int16_t low_inv_quant4[16] = {
        0, -2557, -1612, -1121,  -786,  -530,  -323,  -150,
     2557,  1612,  1121,   786,   530,   323,   150,     0
 };
+static const int16_t low_inv_quant6[64] = {
+     -17,   -17,   -17,   -17, -3101, -2738, -2376, -2088,
+   -1873, -1689, -1535, -1399, -1279, -1170, -1072,  -982,
+    -899,  -822,  -750,  -682,  -618,  -558,  -501,  -447,
+    -396,  -347,  -300,  -254,  -211,  -170,  -130,   -91,
+    3101,  2738,  2376,  2088,  1873,  1689,  1535,  1399,
+    1279,  1170,  1072,   982,   899,   822,   750,   682,
+     618,   558,   501,   447,   396,   347,   300,   254,
+     211,   170,   130,    91,    54,    17,   -54,   -17
+};
 
 /**
  * quadrature mirror filter (QMF) coefficients
@@ -262,16 +272,6 @@ static const int16_t low_inv_quant5[32] = {
     2919,  2195,  1765,  1458,  1219,  1023,   858,   714,
      587,   473,   370,   276,   190,   110,    35,   -35
 };
-static const int16_t low_inv_quant6[64] = {
-     -17,   -17,   -17,   -17, -3101, -2738, -2376, -2088,
-   -1873, -1689, -1535, -1399, -1279, -1170, -1072,  -982,
-    -899,  -822,  -750,  -682,  -618,  -558,  -501,  -447,
-    -396,  -347,  -300,  -254,  -211,  -170,  -130,   -91,
-    3101,  2738,  2376,  2088,  1873,  1689,  1535,  1399,
-    1279,  1170,  1072,   982,   899,   822,   750,   682,
-     618,   558,   501,   447,   396,   347,   300,   254,
-     211,   170,   130,    91,    54,    17,   -54,   -17
-};
 
 static const int16_t *low_inv_quants[3] = { low_inv_quant6, low_inv_quant5,
                                  low_inv_quant4 };