make more tables static

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6996 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h
index 2bd01a4ea0a373d24bdf9d79299edd7653ae5f1e..5eddc3b549b81f8b8a5ec368f780ef92196378f4 100644 (file)
--- a/libavcodec/h263data.h
+++ b/libavcodec/h263data.h
@@ -88,7 +88,7 @@ static const int h263_mb_type_b_map[15]= {
     MB_TYPE_INTRA4x4                | MB_TYPE_CBP | MB_TYPE_QUANT,
 };
 
-const uint8_t cbpc_b_tab[4][2] = {
+static const uint8_t cbpc_b_tab[4][2] = {
 {0, 1},
 {2, 2},
 {7, 3},
@@ -180,7 +180,7 @@ static RLTable rl_inter = {
     inter_level,
 };
 
-const uint16_t intra_vlc_aic[103][2] = {
+static const uint16_t intra_vlc_aic[103][2] = {
 {  0x2,  2 }, {  0x6,  3 }, {  0xe,  4 }, {  0xc,  5 },
 {  0xd,  5 }, { 0x10,  6 }, { 0x11,  6 }, { 0x12,  6 },
 { 0x16,  7 }, { 0x1b,  8 }, { 0x20,  9 }, { 0x21,  9 },
@@ -209,7 +209,7 @@ const uint16_t intra_vlc_aic[103][2] = {
 { 0x59, 12 }, { 0x5a, 12 }, {  0x3,  7 },
 };
 
-const int8_t intra_run_aic[102] = {
+static const int8_t intra_run_aic[102] = {
  0,  0,  0,  0,  0,  0,  0,  0,
  0,  0,  0,  0,  0,  0,  0,  0,
  0,  0,  0,  0,  0,  0,  0,  0,
@@ -225,7 +225,7 @@ const int8_t intra_run_aic[102] = {
 18, 19, 20, 21, 22, 23,
 };
 
-const int8_t intra_level_aic[102] = {
+static const int8_t intra_level_aic[102] = {
  1,  2,  3,  4,  5,  6,  7,  8,
  9, 10, 11, 12, 13, 14, 15, 16,
 17, 18, 19, 20, 21, 22, 23, 24,

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index c4d934f8589acf6f068087ab3ab9c64fa66df601..c392e17afa456b632ff1e89ad1a15601f7523e41 100644 (file)
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -85,10 +85,10 @@ extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp);
 extern void XVMC_init_block(MpegEncContext *s);//set s->block
 #endif
 
-const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,-1};
-const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,-1};
-const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,-1};
-const enum PixelFormat pixfmt_xvmc_mpg2_420[] = {
+static const enum PixelFormat pixfmt_yuv_420[]= {PIX_FMT_YUV420P,-1};
+static const enum PixelFormat pixfmt_yuv_422[]= {PIX_FMT_YUV422P,-1};
+static const enum PixelFormat pixfmt_yuv_444[]= {PIX_FMT_YUV444P,-1};
+static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = {
                                            PIX_FMT_XVMC_MPEG2_IDCT,
                                            PIX_FMT_XVMC_MPEG2_MC,
                                            -1};

diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h
index f763bf3d1349a8996358f838e25c0f5e34a1df04..6c96a495b613bdfe42e9d909bcd5a8c334ef01f6 100644 (file)
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@@ -54,10 +54,10 @@ static const unsigned char vlc_dc_lum_bits[12] = {
     3, 2, 2, 3, 3, 4, 5, 6, 7, 8, 9, 9,
 };
 
-const uint16_t vlc_dc_chroma_code[12] = {
+static const uint16_t vlc_dc_chroma_code[12] = {
     0x0, 0x1, 0x2, 0x6, 0xe, 0x1e, 0x3e, 0x7e, 0xfe, 0x1fe, 0x3fe, 0x3ff,
 };
-const unsigned char vlc_dc_chroma_bits[12] = {
+static const unsigned char vlc_dc_chroma_bits[12] = {
     2, 2, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10,
 };
 

diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h
index a9d0199271dc2f32a0ae2503fa0a3a5f31185368..70e88b5251de2071b34d6a2bc746ff8a54515653 100644 (file)
--- a/libavcodec/vc1data.h
+++ b/libavcodec/vc1data.h
@@ -47,7 +47,7 @@ const int16_t vc1_bfraction_lut[23] = {
 #define B_FRACTION_DEN  256
 
 /* pre-computed scales for all bfractions and base=256 */
-const int16_t vc1_bfraction_lut[23] = {
+static const int16_t vc1_bfraction_lut[23] = {
   128 /*1/2*/,  85 /*1/3*/, 170 /*2/3*/,  64 /*1/4*/,
   192 /*3/4*/,  51 /*1/5*/, 102 /*2/5*/,
   153 /*3/5*/, 204 /*4/5*/,  43 /*1/6*/, 215 /*5/6*/,
@@ -58,7 +58,7 @@ const int16_t vc1_bfraction_lut[23] = {
 };
 #endif
 
-const uint8_t vc1_bfraction_bits[23] = {
+static const uint8_t vc1_bfraction_bits[23] = {
     3, 3, 3, 3,
     3, 3, 3,
     7, 7, 7, 7,
@@ -67,7 +67,7 @@ const uint8_t vc1_bfraction_bits[23] = {
     7, 7,
     7, 7
 };
-const uint8_t vc1_bfraction_codes[23] = {
+static const uint8_t vc1_bfraction_codes[23] = {
      0,   1,   2,   3,
      4,   5,   6,
    112, 113, 114, 115,