Add ff_ prefix to (externally) visible variables

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

1 files changed, 58 insertions, 58 deletions

diff --git a/libavcodec/vc1data.c b/libavcodec/vc1data.c
index 3fa021dcbf..7f50d715f2 100644
--- a/libavcodec/vc1data.c
+++ b/libavcodec/vc1data.c
@@ -30,27 +30,27 @@
 #include "vc1data.h"
 
 /** Table for conversion between TTBLK and TTMB */
-const int vc1_ttblk_to_tt[3][8] = {
+const int ff_vc1_ttblk_to_tt[3][8] = {
   { TT_8X4, TT_4X8, TT_8X8, TT_4X4, TT_8X4_TOP, TT_8X4_BOTTOM, TT_4X8_RIGHT, TT_4X8_LEFT },
   { TT_8X8, TT_4X8_RIGHT, TT_4X8_LEFT, TT_4X4, TT_8X4, TT_4X8, TT_8X4_BOTTOM, TT_8X4_TOP },
   { TT_8X8, TT_4X8, TT_4X4, TT_8X4_BOTTOM, TT_4X8_RIGHT, TT_4X8_LEFT, TT_8X4, TT_8X4_TOP }
 };
 
-const int vc1_ttfrm_to_tt[4] = { TT_8X8, TT_8X4, TT_4X8, TT_4X4 };
+const int ff_vc1_ttfrm_to_tt[4] = { TT_8X8, TT_8X4, TT_4X8, TT_4X4 };
 
 /** MV P mode - the 5th element is only used for mode 1 */
-const uint8_t vc1_mv_pmode_table[2][5] = {
+const uint8_t ff_vc1_mv_pmode_table[2][5] = {
   { MV_PMODE_1MV_HPEL_BILIN, MV_PMODE_1MV, MV_PMODE_1MV_HPEL, MV_PMODE_INTENSITY_COMP, MV_PMODE_MIXED_MV },
   { MV_PMODE_1MV, MV_PMODE_MIXED_MV, MV_PMODE_1MV_HPEL, MV_PMODE_INTENSITY_COMP, MV_PMODE_1MV_HPEL_BILIN }
 };
-const uint8_t vc1_mv_pmode_table2[2][4] = {
+const uint8_t ff_vc1_mv_pmode_table2[2][4] = {
   { MV_PMODE_1MV_HPEL_BILIN, MV_PMODE_1MV, MV_PMODE_1MV_HPEL, MV_PMODE_MIXED_MV },
   { MV_PMODE_1MV, MV_PMODE_MIXED_MV, MV_PMODE_1MV_HPEL, MV_PMODE_1MV_HPEL_BILIN }
 };
 
-const int vc1_fps_nr[5] = { 24, 25, 30, 50, 60 },
-  vc1_fps_dr[2] = { 1000, 1001 };
-const uint8_t vc1_pquant_table[3][32] = {
+const int ff_vc1_fps_nr[5] = { 24, 25, 30, 50, 60 },
+  ff_vc1_fps_dr[2] = { 1000, 1001 };
+const uint8_t ff_vc1_pquant_table[3][32] = {
   {  /* Implicit quantizer */
      0,  1,  2,  3,  4,  5,  6,  7,  8,  6,  7,  8,  9, 10, 11, 12,
     13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 27, 29, 31
@@ -70,34 +70,34 @@ const uint8_t vc1_pquant_table[3][32] = {
  */
 //@{
 #define VC1_BFRACTION_VLC_BITS 7
-VLC vc1_bfraction_vlc;
+VLC ff_vc1_bfraction_vlc;
 #define VC1_IMODE_VLC_BITS 4
-VLC vc1_imode_vlc;
+VLC ff_vc1_imode_vlc;
 #define VC1_NORM2_VLC_BITS 3
-VLC vc1_norm2_vlc;
+VLC ff_vc1_norm2_vlc;
 #define VC1_NORM6_VLC_BITS 9
-VLC vc1_norm6_vlc;
+VLC ff_vc1_norm6_vlc;
 /* Could be optimized, one table only needs 8 bits */
 #define VC1_TTMB_VLC_BITS 9 //12
-VLC vc1_ttmb_vlc[3];
+VLC ff_vc1_ttmb_vlc[3];
 #define VC1_MV_DIFF_VLC_BITS 9 //15
-VLC vc1_mv_diff_vlc[4];
+VLC ff_vc1_mv_diff_vlc[4];
 #define VC1_CBPCY_P_VLC_BITS 9 //14
-VLC vc1_cbpcy_p_vlc[4];
+VLC ff_vc1_cbpcy_p_vlc[4];
 #define VC1_4MV_BLOCK_PATTERN_VLC_BITS 6
-VLC vc1_4mv_block_pattern_vlc[4];
+VLC ff_vc1_4mv_block_pattern_vlc[4];
 #define VC1_TTBLK_VLC_BITS 5
-VLC vc1_ttblk_vlc[3];
+VLC ff_vc1_ttblk_vlc[3];
 #define VC1_SUBBLKPAT_VLC_BITS 6
-VLC vc1_subblkpat_vlc[3];
+VLC ff_vc1_subblkpat_vlc[3];
 
-VLC vc1_ac_coeff_table[8];
+VLC ff_vc1_ac_coeff_table[8];
 //@}
 
 
 #if B_FRACTION_DEN==840 //original bfraction from vc9data.h, not conforming to standard
 /* bfraction is fractional, we scale to the GCD 3*5*7*8 = 840 */
-const int16_t vc1_bfraction_lut[23] = {
+const int16_t ff_vc1_bfraction_lut[23] = {
   420 /*1/2*/, 280 /*1/3*/, 560 /*2/3*/, 210 /*1/4*/,
   630 /*3/4*/, 168 /*1/5*/, 336 /*2/5*/,
   504 /*3/5*/, 672 /*4/5*/, 140 /*1/6*/, 700 /*5/6*/,
@@ -108,7 +108,7 @@ const int16_t vc1_bfraction_lut[23] = {
 };
 #else
 /* pre-computed scales for all bfractions and base=256 */
-const int16_t vc1_bfraction_lut[23] = {
+const int16_t ff_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*/,
@@ -119,7 +119,7 @@ const int16_t vc1_bfraction_lut[23] = {
 };
 #endif
 
-const uint8_t vc1_bfraction_bits[23] = {
+const uint8_t ff_vc1_bfraction_bits[23] = {
     3, 3, 3, 3,
     3, 3, 3,
     7, 7, 7, 7,
@@ -128,7 +128,7 @@ const uint8_t vc1_bfraction_bits[23] = {
     7, 7,
     7, 7
 };
-const uint8_t vc1_bfraction_codes[23] = {
+const uint8_t ff_vc1_bfraction_codes[23] = {
      0,   1,   2,   3,
      4,   5,   6,
    112, 113, 114, 115,
@@ -139,7 +139,7 @@ const uint8_t vc1_bfraction_codes[23] = {
 };
 
 //Same as H.264
-const AVRational vc1_pixel_aspect[16]={
+const AVRational ff_vc1_pixel_aspect[16]={
  {0, 1},
  {1, 1},
  {12, 11},
@@ -159,36 +159,36 @@ const AVRational vc1_pixel_aspect[16]={
 };
 
 /* BitPlane IMODE - such a small table... */
-const uint8_t vc1_imode_codes[7] = {
+const uint8_t ff_vc1_imode_codes[7] = {
   0, 2, 1, 3, 1, 2, 3
 };
-const uint8_t vc1_imode_bits[7] = {
+const uint8_t ff_vc1_imode_bits[7] = {
   4, 2, 3, 2, 4, 3, 3
 };
 
 /* Normal-2 imode */
-const uint8_t vc1_norm2_codes[4] = {
+const uint8_t ff_vc1_norm2_codes[4] = {
   0, 4, 5, 3
 };
-const uint8_t vc1_norm2_bits[4] = {
+const uint8_t ff_vc1_norm2_bits[4] = {
   1, 3, 3, 2
 };
 
-const uint16_t vc1_norm6_codes[64] = {
+const uint16_t ff_vc1_norm6_codes[64] = {
 0x001, 0x002, 0x003, 0x000, 0x004, 0x001, 0x002, 0x047, 0x005, 0x003, 0x004, 0x04B, 0x005, 0x04D, 0x04E, 0x30E,
 0x006, 0x006, 0x007, 0x053, 0x008, 0x055, 0x056, 0x30D, 0x009, 0x059, 0x05A, 0x30C, 0x05C, 0x30B, 0x30A, 0x037,
 0x007, 0x00A, 0x00B, 0x043, 0x00C, 0x045, 0x046, 0x309, 0x00D, 0x049, 0x04A, 0x308, 0x04C, 0x307, 0x306, 0x036,
 0x00E, 0x051, 0x052, 0x305, 0x054, 0x304, 0x303, 0x035, 0x058, 0x302, 0x301, 0x034, 0x300, 0x033, 0x032, 0x007,
 };
 
-const uint8_t vc1_norm6_bits[64] = {
+const uint8_t ff_vc1_norm6_bits[64] = {
  1,  4,  4,  8,  4,  8,  8, 10,  4,  8,  8, 10,  8, 10, 10, 13,
  4,  8,  8, 10,  8, 10, 10, 13,  8, 10, 10, 13, 10, 13, 13,  9,
  4,  8,  8, 10,  8, 10, 10, 13,  8, 10, 10, 13, 10, 13, 13,  9,
  8, 10, 10, 13, 10, 13, 13,  9, 10, 13, 13,  9, 13,  9,  9,  6,
 };
 /* Normal-6 imode */
-const uint8_t vc1_norm6_spec[64][5] = {
+const uint8_t ff_vc1_norm6_spec[64][5] = {
 { 0,  1, 1        },
 { 1,  2, 4        },
 { 2,  3, 4        },
@@ -256,13 +256,13 @@ const uint8_t vc1_norm6_spec[64][5] = {
 };
 
 /* 4MV Block pattern VLC tables */
-const uint8_t vc1_4mv_block_pattern_codes[4][16] = {
+const uint8_t ff_vc1_4mv_block_pattern_codes[4][16] = {
   { 14, 58, 59, 25, 12, 26, 15, 15, 13, 24, 27,  0, 28,  1,  2,  2},
   {  8, 18, 19,  4, 20,  5, 30, 11, 21, 31,  6, 12,  7, 13, 14,  0},
   { 15,  6,  7,  2,  8,  3, 28,  9, 10, 29,  4, 11,  5, 12, 13,  0},
   {  0, 11, 12,  4, 13,  5, 30, 16, 14, 31,  6, 17,  7, 18, 19, 10}
 };
-const uint8_t vc1_4mv_block_pattern_bits[4][16] = {
+const uint8_t ff_vc1_4mv_block_pattern_bits[4][16] = {
   { 5, 6, 6, 5, 5, 5, 5, 4, 5, 5, 5, 3, 5, 3, 3, 2},
   { 4, 5, 5, 4, 5, 4, 5, 4, 5, 5, 4, 4, 4, 4, 4, 2},
   { 4, 4, 4, 4, 4, 4, 5, 4, 4, 5, 4, 4, 4, 4, 4, 3},
@@ -275,7 +275,7 @@ const uint8_t wmv3_dc_scale_table[32]={
 
 /* P-Picture CBPCY VLC tables */
 #if 1 // Looks like original tables are not conforming to standard at all. Are they used for old WMV?
-const uint16_t vc1_cbpcy_p_codes[4][64] = {
+const uint16_t ff_vc1_cbpcy_p_codes[4][64] = {
   {
       0,   6,  15,  13,  13,  11,   3,  13,   5,   8,  49,  10,  12, 114, 102, 119,
       1,  54,  96,   8,  10, 111,   5,  15,  12,  10,   2,  12,  13, 115,  53,  63,
@@ -302,7 +302,7 @@ const uint16_t vc1_cbpcy_p_codes[4][64] = {
    }
 };
 
-const uint8_t vc1_cbpcy_p_bits[4][64] = {
+const uint8_t ff_vc1_cbpcy_p_bits[4][64] = {
   {
     13,  13,   7,  13,   7,  13,  13,  12,   6,  13,   7,  12,   6,   8,   8,   8,
      5,   7,   8,  12,   6,   8,  13,  12,   7,  13,  13,  12,   6,   8,   7,   7,
@@ -329,7 +329,7 @@ const uint8_t vc1_cbpcy_p_bits[4][64] = {
   }
 };
 #else
-const uint16_t vc1_cbpcy_p_codes[4][64] = {
+const uint16_t ff_vc1_cbpcy_p_codes[4][64] = {
   {
       0,   1,   1,   4,   5,   1,  12,   4,  13,  14,  10,  11,  12,   7,  13,   2,
      15,   1,  96,   1,  49,  97,   2, 100,   3,   4,   5, 101, 102,  52,  53,   4,
@@ -355,7 +355,7 @@ const uint16_t vc1_cbpcy_p_codes[4][64] = {
      44,  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  28,  29,  30,  31
    }
 };
-const uint8_t vc1_cbpcy_p_bits[4][64] = {
+const uint8_t ff_vc1_cbpcy_p_bits[4][64] = {
   {
     13,  6,  5,  6,  6,  7,  7,  5,  7,  7,  6,  6,  6,  5,  6,  3,
      7,  8,  8, 13,  7,  8, 13,  8, 13, 13, 13,  8,  8,  7,  7,  3,
@@ -391,7 +391,7 @@ const uint8_t vc1_cbpcy_p_bits[4][64] = {
  * 8x4:MB:btm  8x4:MB:top  8x4,MB,both
  * 4x8,MB,right  4x8,MB,left
  * 4x4,MB                               */
-const uint16_t vc1_ttmb_codes[3][16] = {
+const uint16_t ff_vc1_ttmb_codes[3][16] = {
   {
     0x0003,
     0x002E, 0x005F, 0x0000,
@@ -421,7 +421,7 @@ const uint16_t vc1_ttmb_codes[3][16] = {
   }
 };
 
-const uint8_t vc1_ttmb_bits[3][16] = {
+const uint8_t ff_vc1_ttmb_bits[3][16] = {
   {
      2,
      6,  7,  2,
@@ -452,31 +452,31 @@ const uint8_t vc1_ttmb_bits[3][16] = {
 };
 
 /* TTBLK (Transform Type per Block) tables */
-const uint8_t vc1_ttblk_codes[3][8] = {
+const uint8_t ff_vc1_ttblk_codes[3][8] = {
   {  0,  1,  3,  5, 16, 17, 18, 19},
   {  3,  0,  1,  2,  3,  5,  8,  9},
   {  1,  0,  1,  4,  6,  7, 10, 11}
 };
-const uint8_t vc1_ttblk_bits[3][8] = {
+const uint8_t ff_vc1_ttblk_bits[3][8] = {
   {  2,  2,  2,  3,  5,  5,  5,  5},
   {  2,  3,  3,  3,  3,  3,  4,  4},
   {  2,  3,  3,  3,  3,  3,  4,  4}
 };
 
 /* SUBBLKPAT tables, p93-94, reordered */
-const uint8_t vc1_subblkpat_codes[3][15] = {
+const uint8_t ff_vc1_subblkpat_codes[3][15] = {
   { 14, 12,  7, 11,  9, 26,  2, 10, 27,  8,  0,  6,  1, 15,  1},
   { 14,  0,  8, 15, 10,  4, 23, 13,  5,  9, 25,  3, 24, 22,  1},
   {  5,  6,  2,  2,  8,  0, 28,  3,  1,  3, 29,  1, 19, 18, 15}
 };
-const uint8_t vc1_subblkpat_bits[3][15] = {
+const uint8_t ff_vc1_subblkpat_bits[3][15] = {
   {  5,  5,  5,  5,  5,  6,  4,  5,  6,  5,  4,  5,  4,  5,  1},
   {  4,  3,  4,  4,  4,  5,  5,  4,  5,  4,  5,  4,  5,  5,  2},
   {  3,  3,  4,  3,  4,  5,  5,  3,  5,  4,  5,  4,  5,  5,  4}
 };
 
 /* MV differential tables, p265 */
-const uint16_t vc1_mv_diff_codes[4][73] = {
+const uint16_t ff_vc1_mv_diff_codes[4][73] = {
   {
        0,    2,    3,    8,  576,    3,    2,    6,
        5,  577,  578,    7,    8,    9,   40,   19,
@@ -526,7 +526,7 @@ const uint16_t vc1_mv_diff_codes[4][73] = {
       15 /* 73 elements */
   }
 };
-const uint8_t vc1_mv_diff_bits[4][73] = {
+const uint8_t ff_vc1_mv_diff_bits[4][73] = {
   {
      6,  7,  7,  8, 14,  6,  5,  6,  7, 14, 14,  6,  6,  6,  8,  9,
     10,  9,  7,  7,  7, 14, 14, 10,  9, 10,  8, 10, 10, 14, 14, 14,
@@ -561,7 +561,7 @@ const uint8_t vc1_mv_diff_bits[4][73] = {
 /* DC differentials low+hi-mo, p217 are the same as in msmpeg4data .h */
 
 /* Scantables/ZZ scan are at 11.9 (p262) and 8.1.1.12 (p10) */
-const int8_t vc1_normal_zz[64] = {
+const int8_t ff_vc1_normal_zz[64] = {
        0,     8,     1,     2,     9,    16,    24,    17,
       10,     3,     4,    11,    18,    25,    32,    40,
       33,    48,    26,    19,    12,     5,     6,    13,
@@ -572,7 +572,7 @@ const int8_t vc1_normal_zz[64] = {
       61,    46,    39,    47,    54,    62,    55,    63
 };
 
-const int8_t vc1_horizontal_zz [64] = /* Table 227 */
+const int8_t ff_vc1_horizontal_zz [64] = /* Table 227 */
 {
        0,     1,     8,     2,     3,     9,    16,    24,
       17,    10,     4,     5,    11,    18,    25,    32,
@@ -584,7 +584,7 @@ const int8_t vc1_horizontal_zz [64] = /* Table 227 */
       46,    39,    47,    54,    61,    62,    55,    63
 };
 
-const int8_t vc1_vertical_zz [64] = /* Table 228 */
+const int8_t ff_vc1_vertical_zz [64] = /* Table 228 */
 {
        0,     8,    16,     1,    24,    32,    40,     9,
        2,     3,    10,    17,    25,    48,    56,    41,
@@ -596,7 +596,7 @@ const int8_t vc1_vertical_zz [64] = /* Table 228 */
       46,    39,    47,    54,    61,    62,    55,    63
 };
 
-const int8_t vc1_simple_progressive_8x8_zz [64] =
+const int8_t ff_vc1_simple_progressive_8x8_zz [64] =
 /* Table 229 */
 {
        0,     8,     1,     2,     9,    16,    24,    17,
@@ -609,7 +609,7 @@ const int8_t vc1_simple_progressive_8x8_zz [64] =
       61,    62,    54,    46,    39,    47,    55,    63
 };
 
-const int8_t vc1_simple_progressive_8x4_zz [32] = /* Table 230 */
+const int8_t ff_vc1_simple_progressive_8x4_zz [32] = /* Table 230 */
 {
        0,     1,     2,     8,     3,     9,    10,    16,
        4,    11,    17,    24,    18,    12,     5,    19,
@@ -617,7 +617,7 @@ const int8_t vc1_simple_progressive_8x4_zz [32] = /* Table 230 */
       14,    22,    29,     7,    30,    15,    23,    31
 };
 
-const int8_t vc1_simple_progressive_4x8_zz [32] = /* Table 231 */
+const int8_t ff_vc1_simple_progressive_4x8_zz [32] = /* Table 231 */
 {
        0,     8,     1,    16,
        9,    24,    17,     2,
@@ -630,7 +630,7 @@ const int8_t vc1_simple_progressive_4x8_zz [32] = /* Table 231 */
 };
 
 /* Table 232 */
-const int8_t vc1_simple_progressive_4x4_zz [16] =
+const int8_t ff_vc1_simple_progressive_4x4_zz [16] =
 {
        0,     8,    16,     1,
        9,    24,    17,     2,
@@ -638,7 +638,7 @@ const int8_t vc1_simple_progressive_4x4_zz [16] =
       11,    26,    19,    27
 };
 
-const int8_t vc1_adv_progressive_8x4_zz [32] = /* Table 233 */
+const int8_t ff_vc1_adv_progressive_8x4_zz [32] = /* Table 233 */
 {
        0,     8,     1,    16,     2,     9,    10,     3,
       24,    17,     4,    11,    18,    12,     5,    19,
@@ -646,7 +646,7 @@ const int8_t vc1_adv_progressive_8x4_zz [32] = /* Table 233 */
       14,    22,    29,     7,    30,    15,    23,    31
 };
 
-const int8_t vc1_adv_progressive_4x8_zz [32] = /* Table 234 */
+const int8_t ff_vc1_adv_progressive_4x8_zz [32] = /* Table 234 */
 {
        0,     1,     8,     2,
        9,    16,    17,    24,
@@ -658,7 +658,7 @@ const int8_t vc1_adv_progressive_4x8_zz [32] = /* Table 234 */
       35,    43,    51,    59
 };
 
-const int8_t vc1_adv_interlaced_8x8_zz [64] = /* Table 235 */
+const int8_t ff_vc1_adv_interlaced_8x8_zz [64] = /* Table 235 */
 {
        0,     8,     1,    16,    24,     9,     2,    32,
       40,    48,    56,    17,    10,     3,    25,    18,
@@ -670,7 +670,7 @@ const int8_t vc1_adv_interlaced_8x8_zz [64] = /* Table 235 */
       61,    62,    54,    46,    39,    47,    55,    63
 };
 
-const int8_t vc1_adv_interlaced_8x4_zz [32] = /* Table 236 */
+const int8_t ff_vc1_adv_interlaced_8x4_zz [32] = /* Table 236 */
 {
        0,     8,    16,    24,     1,     9,     2,    17,
       25,    10,     3,    18,    26,     4,    11,    19,
@@ -678,7 +678,7 @@ const int8_t vc1_adv_interlaced_8x4_zz [32] = /* Table 236 */
       14,    22,    29,     7,    30,    15,    23,    31
 };
 
-const int8_t vc1_adv_interlaced_4x8_zz [32] = /* Table 237 */
+const int8_t ff_vc1_adv_interlaced_4x8_zz [32] = /* Table 237 */
 {
        0,     1,     2,     8,
       16,     9,    24,    17,
@@ -690,7 +690,7 @@ const int8_t vc1_adv_interlaced_4x8_zz [32] = /* Table 237 */
       35,    43,    51,    59
 };
 
-const int8_t vc1_adv_interlaced_4x4_zz [16] = /* Table 238 */
+const int8_t ff_vc1_adv_interlaced_4x4_zz [16] = /* Table 238 */
 {
        0,     8,    16,    24,
        1,     9,    17,     2,
@@ -700,7 +700,7 @@ const int8_t vc1_adv_interlaced_4x4_zz [16] = /* Table 238 */
 
 
 /* DQScale as specified in 8.1.3.9 - almost identical to 0x40000/i */
-const int32_t vc1_dqscale[63] = {
+const int32_t ff_vc1_dqscale[63] = {
 0x40000, 0x20000, 0x15555, 0x10000, 0xCCCD, 0xAAAB, 0x9249, 0x8000,
     0x71C7, 0x6666, 0x5D17, 0x5555, 0x4EC5, 0x4925, 0x4444, 0x4000,
     0x3C3C, 0x38E4, 0x35E5, 0x3333, 0x30C3, 0x2E8C, 0x2C86, 0x2AAB,