From e161e007be2ca2df1e560470f94d4038dd841d67 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 11 Apr 2009 11:47:15 +0000 Subject: Use INIT_VLC_USE_STATIC and not its value "1". Originally committed as revision 18430 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/4xm.c | 2 +- libavcodec/asv1.c | 10 +++++----- libavcodec/dca.c | 8 ++++---- libavcodec/h261dec.c | 8 ++++---- libavcodec/intrax8.c | 4 ++-- libavcodec/msmpeg4.c | 32 ++++++++++++++++---------------- libavcodec/rv10.c | 4 ++-- libavcodec/svq1dec.c | 10 +++++----- libavcodec/vc1.c | 24 ++++++++++++------------ libavcodec/wnv1.c | 2 +- 10 files changed, 52 insertions(+), 52 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index dd7daa5..a9ad1e9 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -242,7 +242,7 @@ static av_cold void init_vlcs(FourXContext *f){ 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); } } diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c index 81dc18d..76f1000 100644 --- a/libavcodec/asv1.c +++ b/libavcodec/asv1.c @@ -121,19 +121,19 @@ static av_cold void init_vlcs(ASV1Context *a){ 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); } } diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 8dfec8e..4b57242 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -264,19 +264,19 @@ static av_cold void dca_init_vlcs(void) 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 @@ static av_cold void dca_init_vlcs(void) 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; } diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 3509e9f..4179ab3 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -55,16 +55,16 @@ static av_cold void h261_decode_init_vlc(H261Context *h){ 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); } diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 40ad1fb..2ae57d9 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -50,7 +50,7 @@ static av_cold void x8_vlc_init(void){ 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 @@ static av_cold void x8_vlc_init(void){ 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]); } diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 3a710aa..b58deed 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -1074,62 +1074,62 @@ av_cold int ff_msmpeg4_decode_init(MpegEncContext *s) 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){ diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index 99fb904..c7ecd33 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -586,10 +586,10 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx) 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; } diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 225c9e8..c45ef97 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -782,7 +782,7 @@ static av_cold int svq1_decode_init(AVCodecContext *avctx) 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 @@ static av_cold int svq1_decode_init(AVCodecContext *avctx) 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; } diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index f3d3cd4..ef6f8b2 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -65,47 +65,47 @@ static int vc1_init_common(VC1Context *v) 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 */ diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index fa3a308..e721a98 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -136,7 +136,7 @@ static av_cold int decode_init(AVCodecContext *avctx){ if(!code_vlc.table){ init_vlc(&code_vlc, CODE_VLC_BITS, 16, &code_tab[0][1], 4, 2, - &code_tab[0][0], 4, 2, 1); + &code_tab[0][0], 4, 2, INIT_VLC_USE_STATIC); } return 0; -- cgit v1.1