[FFmpeg-cvslog] r10987 - in trunk/libavcodec: intrax8.c intrax8huf.h

[aurel]

Author: aurel
Date: Sat Nov 10 02:02:36 2007
New Revision: 10987

Log:
make some tables static

Modified:
   trunk/libavcodec/intrax8.c
   trunk/libavcodec/intrax8huf.h

Modified: trunk/libavcodec/intrax8.c
==============================================================================
--- trunk/libavcodec/intrax8.c	(original)
+++ trunk/libavcodec/intrax8.c	Sat Nov 10 02:02:36 2007
@@ -53,10 +53,10 @@ static void x8_vlc_init(){
               1)
 //set ac tables
     for(i=0;i<8;i++){
-        init_ac_vlc( j_ac_vlc[0][0][i], ff_x8_ac0_highquant_table[i][0] );
-        init_ac_vlc( j_ac_vlc[0][1][i], ff_x8_ac1_highquant_table[i][0] );
-        init_ac_vlc( j_ac_vlc[1][0][i], ff_x8_ac0_lowquant_table [i][0] );
-        init_ac_vlc( j_ac_vlc[1][1][i], ff_x8_ac1_lowquant_table [i][0] );
+        init_ac_vlc( j_ac_vlc[0][0][i], x8_ac0_highquant_table[i][0] );
+        init_ac_vlc( j_ac_vlc[0][1][i], x8_ac1_highquant_table[i][0] );
+        init_ac_vlc( j_ac_vlc[1][0][i], x8_ac0_lowquant_table [i][0] );
+        init_ac_vlc( j_ac_vlc[1][1][i], x8_ac1_lowquant_table [i][0] );
     }
 #undef init_ac_vlc
 
@@ -68,8 +68,8 @@ static void x8_vlc_init(){
         &src[0],4,2, \
         1);
     for(i=0;i<8;i++){
-        init_dc_vlc( j_dc_vlc[0][i], ff_x8_dc_highquant_table[i][0]);
-        init_dc_vlc( j_dc_vlc[1][i], ff_x8_dc_lowquant_table [i][0]);
+        init_dc_vlc( j_dc_vlc[0][i], x8_dc_highquant_table[i][0]);
+        init_dc_vlc( j_dc_vlc[1][i], x8_dc_lowquant_table [i][0]);
     }
 #undef init_dc_vlc
 
@@ -81,10 +81,10 @@ static void x8_vlc_init(){
     &src[0],4,2, \
     1);
     for(i=0;i<2;i++){
-        init_or_vlc( j_orient_vlc[0][i], ff_x8_orient_highquant_table[i][0]);
+        init_or_vlc( j_orient_vlc[0][i], x8_orient_highquant_table[i][0]);
     }
     for(i=0;i<4;i++){
-        init_or_vlc( j_orient_vlc[1][i], ff_x8_orient_lowquant_table [i][0])
+        init_or_vlc( j_orient_vlc[1][i], x8_orient_lowquant_table [i][0])
     }
 }
 #undef init_or_vlc

Modified: trunk/libavcodec/intrax8huf.h
==============================================================================
--- trunk/libavcodec/intrax8huf.h	(original)
+++ trunk/libavcodec/intrax8huf.h	Sat Nov 10 02:02:36 2007
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 
-const uint16_t ff_x8_orient_lowquant_table[4][12][2]={
+static const uint16_t x8_orient_lowquant_table[4][12][2]={
     {//0
         {0x0000,  1}, {0x0004,  3}, {0x0005,  3}, {0x000C,  4},
         {0x000D,  4}, {0x0038,  6}, {0x001D,  5}, {0x0039,  6},
@@ -42,7 +42,7 @@ const uint16_t ff_x8_orient_lowquant_tab
     }
 };
 
-const uint16_t ff_x8_orient_highquant_table[2][12][2]={
+static const uint16_t x8_orient_highquant_table[2][12][2]={
     {//0
         {0x0000,  2}, {0x0001,  2}, {0x0004,  3}, {0x0005,  3},
         {0x0006,  3}, {0x0038,  6}, {0x001D,  5}, {0x0039,  6},
@@ -56,7 +56,7 @@ const uint16_t ff_x8_orient_highquant_ta
 #define MAX_OR_VLC_BITS 7
 
 
-const uint16_t ff_x8_dc_lowquant_table[8][34][2]={
+static const uint16_t x8_dc_lowquant_table[8][34][2]={
     {//0
         {0x0000,  5}, {0x0001,  4}, {0x0001,  5}, {0x0004,  5},
         {0x0005,  5}, {0x0006,  5}, {0x000E,  6}, {0x000F,  6},
@@ -140,7 +140,7 @@ const uint16_t ff_x8_dc_lowquant_table[8
     }
 };
 
-const uint16_t ff_x8_dc_highquant_table[8][34][2]={
+static const uint16_t x8_dc_highquant_table[8][34][2]={
     {//0
         {0x0000,  5}, {0x0001,  4}, {0x0002,  4}, {0x0001,  5},
         {0x0006,  5}, {0x0004,  4}, {0x0007,  5}, {0x000A,  5},
@@ -226,7 +226,7 @@ const uint16_t ff_x8_dc_highquant_table[
 #define MAX_DC_VLC_BITS 14
 
 
-const uint16_t ff_x8_ac0_lowquant_table[8][77][2]={
+static const uint16_t x8_ac0_lowquant_table[8][77][2]={
     {//0
         {0x0000,  2}, {0x0002,  3}, {0x0006,  4}, {0x000E,  5},
         {0x001E,  6}, {0x003E,  7}, {0x003F,  7}, {0x0040,  7},
@@ -398,7 +398,7 @@ const uint16_t ff_x8_ac0_lowquant_table[
     }
 };
 
-const uint16_t ff_x8_ac0_highquant_table[8][77][2]={
+static const uint16_t x8_ac0_highquant_table[8][77][2]={
     {//0
         {0x0000,  3}, {0x0002,  4}, {0x000C,  6}, {0x000D,  6},
         {0x001C,  7}, {0x000F,  6}, {0x1D00, 15}, {0x003B,  8},
@@ -570,7 +570,7 @@ const uint16_t ff_x8_ac0_highquant_table
     }
 };
 
-const uint16_t ff_x8_ac1_lowquant_table[8][77][2]={
+static const uint16_t x8_ac1_lowquant_table[8][77][2]={
     {//0
         {0x0000,  3}, {0x0002,  4}, {0x0003,  4}, {0x0008,  5},
         {0x0012,  6}, {0x0026,  7}, {0x0014,  6}, {0x004E,  8},
@@ -742,7 +742,7 @@ const uint16_t ff_x8_ac1_lowquant_table[
     }
 };
 
-const uint16_t ff_x8_ac1_highquant_table[8][77][2]={
+static const uint16_t x8_ac1_highquant_table[8][77][2]={
     {//0
         {0x0000,  3}, {0x0002,  4}, {0x0006,  5}, {0x0007,  5},
         {0x0008,  5}, {0x0009,  5}, {0x0014,  6}, {0x002A,  7},