Mercurial > libavcodec.hg
changeset 9393:25b3650b4db5 libavcodec
Use INIT_VLC_USE_STATIC and not its value "1".
| author | cehoyos |
|---|---|
| date | Sat, 11 Apr 2009 11:47:15 +0000 |
| parents | a5bc2084bd6a |
| children | d322325fc00e |
| files | 4xm.c asv1.c dca.c h261dec.c intrax8.c msmpeg4.c rv10.c svq1dec.c vc1.c wnv1.c |
| diffstat | 10 files changed, 52 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/4xm.c Fri Apr 10 22:29:56 2009 +0000 +++ b/4xm.c Sat Apr 11 11:47:15 2009 +0000 @@ -242,7 +242,7 @@ for(i=0; i<8; i++){ init_vlc(&block_type_vlc[0][i], BLOCK_TYPE_VLC_BITS, 7, &block_type_tab[0][i][0][1], 2, 1, - &block_type_tab[0][i][0][0], 2, 1, 1); + &block_type_tab[0][i][0][0], 2, 1, INIT_VLC_USE_STATIC); } }
--- a/asv1.c Fri Apr 10 22:29:56 2009 +0000 +++ b/asv1.c Sat Apr 11 11:47:15 2009 +0000 @@ -121,19 +121,19 @@ init_vlc(&ccp_vlc, VLC_BITS, 17, &ccp_tab[0][1], 2, 1, - &ccp_tab[0][0], 2, 1, 1); + &ccp_tab[0][0], 2, 1, INIT_VLC_USE_STATIC); init_vlc(&dc_ccp_vlc, VLC_BITS, 8, &dc_ccp_tab[0][1], 2, 1, - &dc_ccp_tab[0][0], 2, 1, 1); + &dc_ccp_tab[0][0], 2, 1, INIT_VLC_USE_STATIC); init_vlc(&ac_ccp_vlc, VLC_BITS, 16, &ac_ccp_tab[0][1], 2, 1, - &ac_ccp_tab[0][0], 2, 1, 1); + &ac_ccp_tab[0][0], 2, 1, INIT_VLC_USE_STATIC); init_vlc(&level_vlc, VLC_BITS, 7, &level_tab[0][1], 2, 1, - &level_tab[0][0], 2, 1, 1); + &level_tab[0][0], 2, 1, INIT_VLC_USE_STATIC); init_vlc(&asv2_level_vlc, ASV2_LEVEL_VLC_BITS, 63, &asv2_level_tab[0][1], 2, 1, - &asv2_level_tab[0][0], 2, 1, 1); + &asv2_level_tab[0][0], 2, 1, INIT_VLC_USE_STATIC); } }
--- a/dca.c Fri Apr 10 22:29:56 2009 +0000 +++ b/dca.c Sat Apr 11 11:47:15 2009 +0000 @@ -264,19 +264,19 @@ for (i = 0; i < 5; i++) init_vlc(&dca_bitalloc_index.vlc[i], bitalloc_12_vlc_bits[i], 12, bitalloc_12_bits[i], 1, 1, - bitalloc_12_codes[i], 2, 2, 1); + bitalloc_12_codes[i], 2, 2, INIT_VLC_USE_STATIC); dca_scalefactor.offset = -64; dca_scalefactor.wrap = 2; for (i = 0; i < 5; i++) init_vlc(&dca_scalefactor.vlc[i], SCALES_VLC_BITS, 129, scales_bits[i], 1, 1, - scales_codes[i], 2, 2, 1); + scales_codes[i], 2, 2, INIT_VLC_USE_STATIC); dca_tmode.offset = 0; dca_tmode.wrap = 1; for (i = 0; i < 4; i++) init_vlc(&dca_tmode.vlc[i], tmode_vlc_bits[i], 4, tmode_bits[i], 1, 1, - tmode_codes[i], 2, 2, 1); + tmode_codes[i], 2, 2, INIT_VLC_USE_STATIC); for(i = 0; i < 10; i++) for(j = 0; j < 7; j++){ @@ -286,7 +286,7 @@ init_vlc(&dca_smpl_bitalloc[i+1].vlc[j], bitalloc_maxbits[i][j], bitalloc_sizes[i], bitalloc_bits[i][j], 1, 1, - bitalloc_codes[i][j], 2, 2, 1); + bitalloc_codes[i][j], 2, 2, INIT_VLC_USE_STATIC); } vlcs_initialized = 1; }
--- a/h261dec.c Fri Apr 10 22:29:56 2009 +0000 +++ b/h261dec.c Sat Apr 11 11:47:15 2009 +0000 @@ -55,16 +55,16 @@ done = 1; init_vlc(&h261_mba_vlc, H261_MBA_VLC_BITS, 35, h261_mba_bits, 1, 1, - h261_mba_code, 1, 1, 1); + h261_mba_code, 1, 1, INIT_VLC_USE_STATIC); init_vlc(&h261_mtype_vlc, H261_MTYPE_VLC_BITS, 10, h261_mtype_bits, 1, 1, - h261_mtype_code, 1, 1, 1); + h261_mtype_code, 1, 1, INIT_VLC_USE_STATIC); init_vlc(&h261_mv_vlc, H261_MV_VLC_BITS, 17, &h261_mv_tab[0][1], 2, 1, - &h261_mv_tab[0][0], 2, 1, 1); + &h261_mv_tab[0][0], 2, 1, INIT_VLC_USE_STATIC); init_vlc(&h261_cbp_vlc, H261_CBP_VLC_BITS, 63, &h261_cbp_tab[0][1], 2, 1, - &h261_cbp_tab[0][0], 2, 1, 1); + &h261_cbp_tab[0][0], 2, 1, INIT_VLC_USE_STATIC); init_rl(&h261_rl_tcoeff, ff_h261_rl_table_store); INIT_VLC_RL(h261_rl_tcoeff, 552); }
--- a/intrax8.c Fri Apr 10 22:29:56 2009 +0000 +++ b/intrax8.c Sat Apr 11 11:47:15 2009 +0000 @@ -50,7 +50,7 @@ AC_VLC_BITS,77, \ &src[1],4,2, \ &src[0],4,2, \ - 1) + INIT_VLC_USE_STATIC) //set ac tables for(i=0;i<8;i++){ init_ac_vlc( j_ac_vlc[0][0][i], x8_ac0_highquant_table[i][0] ); @@ -79,7 +79,7 @@ OR_VLC_BITS,12, \ &src[1],4,2, \ &src[0],4,2, \ - 1); + INIT_VLC_USE_STATIC); for(i=0;i<2;i++){ init_or_vlc( j_orient_vlc[0][i], x8_orient_highquant_table[i][0]); }
--- a/msmpeg4.c Fri Apr 10 22:29:56 2009 +0000 +++ b/msmpeg4.c Sat Apr 11 11:47:15 2009 +0000 @@ -1074,62 +1074,62 @@ mv = &mv_tables[i]; init_vlc(&mv->vlc, MV_VLC_BITS, mv->n + 1, mv->table_mv_bits, 1, 1, - mv->table_mv_code, 2, 2, 1); + mv->table_mv_code, 2, 2, INIT_VLC_USE_STATIC); } init_vlc(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120, &ff_table0_dc_lum[0][1], 8, 4, - &ff_table0_dc_lum[0][0], 8, 4, 1); + &ff_table0_dc_lum[0][0], 8, 4, INIT_VLC_USE_STATIC); init_vlc(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120, &ff_table0_dc_chroma[0][1], 8, 4, - &ff_table0_dc_chroma[0][0], 8, 4, 1); + &ff_table0_dc_chroma[0][0], 8, 4, INIT_VLC_USE_STATIC); init_vlc(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120, &ff_table1_dc_lum[0][1], 8, 4, - &ff_table1_dc_lum[0][0], 8, 4, 1); + &ff_table1_dc_lum[0][0], 8, 4, INIT_VLC_USE_STATIC); init_vlc(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120, &ff_table1_dc_chroma[0][1], 8, 4, - &ff_table1_dc_chroma[0][0], 8, 4, 1); + &ff_table1_dc_chroma[0][0], 8, 4, INIT_VLC_USE_STATIC); init_vlc(&v2_dc_lum_vlc, DC_VLC_BITS, 512, &v2_dc_lum_table[0][1], 8, 4, - &v2_dc_lum_table[0][0], 8, 4, 1); + &v2_dc_lum_table[0][0], 8, 4, INIT_VLC_USE_STATIC); init_vlc(&v2_dc_chroma_vlc, DC_VLC_BITS, 512, &v2_dc_chroma_table[0][1], 8, 4, - &v2_dc_chroma_table[0][0], 8, 4, 1); + &v2_dc_chroma_table[0][0], 8, 4, INIT_VLC_USE_STATIC); init_vlc(&cbpy_vlc, CBPY_VLC_BITS, 16, &cbpy_tab[0][1], 2, 1, - &cbpy_tab[0][0], 2, 1, 1); + &cbpy_tab[0][0], 2, 1, INIT_VLC_USE_STATIC); init_vlc(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4, &v2_intra_cbpc[0][1], 2, 1, - &v2_intra_cbpc[0][0], 2, 1, 1); + &v2_intra_cbpc[0][0], 2, 1, INIT_VLC_USE_STATIC); init_vlc(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8, &v2_mb_type[0][1], 2, 1, - &v2_mb_type[0][0], 2, 1, 1); + &v2_mb_type[0][0], 2, 1, INIT_VLC_USE_STATIC); init_vlc(&v2_mv_vlc, V2_MV_VLC_BITS, 33, &mvtab[0][1], 2, 1, - &mvtab[0][0], 2, 1, 1); + &mvtab[0][0], 2, 1, INIT_VLC_USE_STATIC); for(i=0; i<4; i++){ init_vlc(&ff_mb_non_intra_vlc[i], MB_NON_INTRA_VLC_BITS, 128, &wmv2_inter_table[i][0][1], 8, 4, - &wmv2_inter_table[i][0][0], 8, 4, 1); //FIXME name? + &wmv2_inter_table[i][0][0], 8, 4, INIT_VLC_USE_STATIC); //FIXME name? } init_vlc(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64, &ff_msmp4_mb_i_table[0][1], 4, 2, - &ff_msmp4_mb_i_table[0][0], 4, 2, 1); + &ff_msmp4_mb_i_table[0][0], 4, 2, INIT_VLC_USE_STATIC); init_vlc(&v1_intra_cbpc_vlc, V1_INTRA_CBPC_VLC_BITS, 8, intra_MCBPC_bits, 1, 1, - intra_MCBPC_code, 1, 1, 1); + intra_MCBPC_code, 1, 1, INIT_VLC_USE_STATIC); init_vlc(&v1_inter_cbpc_vlc, V1_INTER_CBPC_VLC_BITS, 25, inter_MCBPC_bits, 1, 1, - inter_MCBPC_code, 1, 1, 1); + inter_MCBPC_code, 1, 1, INIT_VLC_USE_STATIC); init_vlc(&ff_inter_intra_vlc, INTER_INTRA_VLC_BITS, 4, &table_inter_intra[0][1], 2, 1, - &table_inter_intra[0][0], 2, 1, 1); + &table_inter_intra[0][0], 2, 1, INIT_VLC_USE_STATIC); } switch(s->msmpeg4_version){
--- a/rv10.c Fri Apr 10 22:29:56 2009 +0000 +++ b/rv10.c Sat Apr 11 11:47:15 2009 +0000 @@ -586,10 +586,10 @@ if (!done) { init_vlc(&rv_dc_lum, DC_VLC_BITS, 256, rv_lum_bits, 1, 1, - rv_lum_code, 2, 2, 1); + rv_lum_code, 2, 2, INIT_VLC_USE_STATIC); init_vlc(&rv_dc_chrom, DC_VLC_BITS, 256, rv_chrom_bits, 1, 1, - rv_chrom_code, 2, 2, 1); + rv_chrom_code, 2, 2, INIT_VLC_USE_STATIC); done = 1; }
--- a/svq1dec.c Fri Apr 10 22:29:56 2009 +0000 +++ b/svq1dec.c Sat Apr 11 11:47:15 2009 +0000 @@ -782,7 +782,7 @@ init_vlc(&svq1_block_type, 2, 4, &ff_svq1_block_type_vlc[0][1], 2, 1, - &ff_svq1_block_type_vlc[0][0], 2, 1, 1); + &ff_svq1_block_type_vlc[0][0], 2, 1, INIT_VLC_USE_STATIC); init_vlc(&svq1_motion_component, 7, 33, &mvtab[0][1], 2, 1, @@ -791,19 +791,19 @@ for (i = 0; i < 6; i++) { init_vlc(&svq1_intra_multistage[i], 3, 8, &ff_svq1_intra_multistage_vlc[i][0][1], 2, 1, - &ff_svq1_intra_multistage_vlc[i][0][0], 2, 1, 1); + &ff_svq1_intra_multistage_vlc[i][0][0], 2, 1, INIT_VLC_USE_STATIC); init_vlc(&svq1_inter_multistage[i], 3, 8, &ff_svq1_inter_multistage_vlc[i][0][1], 2, 1, - &ff_svq1_inter_multistage_vlc[i][0][0], 2, 1, 1); + &ff_svq1_inter_multistage_vlc[i][0][0], 2, 1, INIT_VLC_USE_STATIC); } init_vlc(&svq1_intra_mean, 8, 256, &ff_svq1_intra_mean_vlc[0][1], 4, 2, - &ff_svq1_intra_mean_vlc[0][0], 4, 2, 1); + &ff_svq1_intra_mean_vlc[0][0], 4, 2, INIT_VLC_USE_STATIC); init_vlc(&svq1_inter_mean, 9, 512, &ff_svq1_inter_mean_vlc[0][1], 4, 2, - &ff_svq1_inter_mean_vlc[0][0], 4, 2, 1); + &ff_svq1_inter_mean_vlc[0][0], 4, 2, INIT_VLC_USE_STATIC); return 0; }
--- a/vc1.c Fri Apr 10 22:29:56 2009 +0000 +++ b/vc1.c Sat Apr 11 11:47:15 2009 +0000 @@ -65,47 +65,47 @@ done = 1; init_vlc(&ff_vc1_bfraction_vlc, VC1_BFRACTION_VLC_BITS, 23, ff_vc1_bfraction_bits, 1, 1, - ff_vc1_bfraction_codes, 1, 1, 1); + ff_vc1_bfraction_codes, 1, 1, INIT_VLC_USE_STATIC); init_vlc(&ff_vc1_norm2_vlc, VC1_NORM2_VLC_BITS, 4, ff_vc1_norm2_bits, 1, 1, - ff_vc1_norm2_codes, 1, 1, 1); + ff_vc1_norm2_codes, 1, 1, INIT_VLC_USE_STATIC); init_vlc(&ff_vc1_norm6_vlc, VC1_NORM6_VLC_BITS, 64, ff_vc1_norm6_bits, 1, 1, - ff_vc1_norm6_codes, 2, 2, 1); + ff_vc1_norm6_codes, 2, 2, INIT_VLC_USE_STATIC); init_vlc(&ff_vc1_imode_vlc, VC1_IMODE_VLC_BITS, 7, ff_vc1_imode_bits, 1, 1, - ff_vc1_imode_codes, 1, 1, 1); + ff_vc1_imode_codes, 1, 1, INIT_VLC_USE_STATIC); for (i=0; i<3; i++) { init_vlc(&ff_vc1_ttmb_vlc[i], VC1_TTMB_VLC_BITS, 16, ff_vc1_ttmb_bits[i], 1, 1, - ff_vc1_ttmb_codes[i], 2, 2, 1); + ff_vc1_ttmb_codes[i], 2, 2, INIT_VLC_USE_STATIC); init_vlc(&ff_vc1_ttblk_vlc[i], VC1_TTBLK_VLC_BITS, 8, ff_vc1_ttblk_bits[i], 1, 1, - ff_vc1_ttblk_codes[i], 1, 1, 1); + ff_vc1_ttblk_codes[i], 1, 1, INIT_VLC_USE_STATIC); init_vlc(&ff_vc1_subblkpat_vlc[i], VC1_SUBBLKPAT_VLC_BITS, 15, ff_vc1_subblkpat_bits[i], 1, 1, - ff_vc1_subblkpat_codes[i], 1, 1, 1); + ff_vc1_subblkpat_codes[i], 1, 1, INIT_VLC_USE_STATIC); } for(i=0; i<4; i++) { init_vlc(&ff_vc1_4mv_block_pattern_vlc[i], VC1_4MV_BLOCK_PATTERN_VLC_BITS, 16, ff_vc1_4mv_block_pattern_bits[i], 1, 1, - ff_vc1_4mv_block_pattern_codes[i], 1, 1, 1); + ff_vc1_4mv_block_pattern_codes[i], 1, 1, INIT_VLC_USE_STATIC); init_vlc(&ff_vc1_cbpcy_p_vlc[i], VC1_CBPCY_P_VLC_BITS, 64, ff_vc1_cbpcy_p_bits[i], 1, 1, - ff_vc1_cbpcy_p_codes[i], 2, 2, 1); + ff_vc1_cbpcy_p_codes[i], 2, 2, INIT_VLC_USE_STATIC); init_vlc(&ff_vc1_mv_diff_vlc[i], VC1_MV_DIFF_VLC_BITS, 73, ff_vc1_mv_diff_bits[i], 1, 1, - ff_vc1_mv_diff_codes[i], 2, 2, 1); + ff_vc1_mv_diff_codes[i], 2, 2, INIT_VLC_USE_STATIC); } for(i=0; i<8; i++) init_vlc(&ff_vc1_ac_coeff_table[i], AC_VLC_BITS, vc1_ac_sizes[i], &vc1_ac_tables[i][0][1], 8, 4, - &vc1_ac_tables[i][0][0], 8, 4, 1); + &vc1_ac_tables[i][0][0], 8, 4, INIT_VLC_USE_STATIC); init_vlc(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64, &ff_msmp4_mb_i_table[0][1], 4, 2, - &ff_msmp4_mb_i_table[0][0], 4, 2, 1); + &ff_msmp4_mb_i_table[0][0], 4, 2, INIT_VLC_USE_STATIC); } /* Other defaults */