Originally committed as revision 6996 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -88,7 +88,7 @@ static const int h263_mb_type_b_map[15]= { | |||||
| MB_TYPE_INTRA4x4 | MB_TYPE_CBP | MB_TYPE_QUANT, | 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}, | {0, 1}, | ||||
| {2, 2}, | {2, 2}, | ||||
| {7, 3}, | {7, 3}, | ||||
| @@ -180,7 +180,7 @@ static RLTable rl_inter = { | |||||
| inter_level, | 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 }, | { 0x2, 2 }, { 0x6, 3 }, { 0xe, 4 }, { 0xc, 5 }, | ||||
| { 0xd, 5 }, { 0x10, 6 }, { 0x11, 6 }, { 0x12, 6 }, | { 0xd, 5 }, { 0x10, 6 }, { 0x11, 6 }, { 0x12, 6 }, | ||||
| { 0x16, 7 }, { 0x1b, 8 }, { 0x20, 9 }, { 0x21, 9 }, | { 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 }, | { 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, | 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, | 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, | 1, 2, 3, 4, 5, 6, 7, 8, | ||||
| 9, 10, 11, 12, 13, 14, 15, 16, | 9, 10, 11, 12, 13, 14, 15, 16, | ||||
| 17, 18, 19, 20, 21, 22, 23, 24, | 17, 18, 19, 20, 21, 22, 23, 24, | ||||
| @@ -85,10 +85,10 @@ extern void XVMC_pack_pblocks(MpegEncContext *s,int cbp); | |||||
| extern void XVMC_init_block(MpegEncContext *s);//set s->block | extern void XVMC_init_block(MpegEncContext *s);//set s->block | ||||
| #endif | #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_IDCT, | ||||
| PIX_FMT_XVMC_MPEG2_MC, | PIX_FMT_XVMC_MPEG2_MC, | ||||
| -1}; | -1}; | ||||
| @@ -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, | 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, | 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, | 2, 2, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, | ||||
| }; | }; | ||||
| @@ -47,7 +47,7 @@ const int16_t vc1_bfraction_lut[23] = { | |||||
| #define B_FRACTION_DEN 256 | #define B_FRACTION_DEN 256 | ||||
| /* pre-computed scales for all bfractions and base=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*/, | 128 /*1/2*/, 85 /*1/3*/, 170 /*2/3*/, 64 /*1/4*/, | ||||
| 192 /*3/4*/, 51 /*1/5*/, 102 /*2/5*/, | 192 /*3/4*/, 51 /*1/5*/, 102 /*2/5*/, | ||||
| 153 /*3/5*/, 204 /*4/5*/, 43 /*1/6*/, 215 /*5/6*/, | 153 /*3/5*/, 204 /*4/5*/, 43 /*1/6*/, 215 /*5/6*/, | ||||
| @@ -58,7 +58,7 @@ const int16_t vc1_bfraction_lut[23] = { | |||||
| }; | }; | ||||
| #endif | #endif | ||||
| const uint8_t vc1_bfraction_bits[23] = { | |||||
| static const uint8_t vc1_bfraction_bits[23] = { | |||||
| 3, 3, 3, 3, | 3, 3, 3, 3, | ||||
| 3, 3, 3, | 3, 3, 3, | ||||
| 7, 7, 7, 7, | 7, 7, 7, 7, | ||||
| @@ -67,7 +67,7 @@ const uint8_t vc1_bfraction_bits[23] = { | |||||
| 7, 7, | 7, 7, | ||||
| 7, 7 | 7, 7 | ||||
| }; | }; | ||||
| const uint8_t vc1_bfraction_codes[23] = { | |||||
| static const uint8_t vc1_bfraction_codes[23] = { | |||||
| 0, 1, 2, 3, | 0, 1, 2, 3, | ||||
| 4, 5, 6, | 4, 5, 6, | ||||
| 112, 113, 114, 115, | 112, 113, 114, 115, | ||||