diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-04-11 11:47:15 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-04-11 11:47:15 +0000 |
| commit | e161e007be2ca2df1e560470f94d4038dd841d67 (patch) | |
| tree | 73cf9b3fae73613fc191ece675b43847530c59aa /libavcodec/msmpeg4.c | |
| parent | 46e97dc3c2281954fabe273c9e05f458ea2599e4 (diff) | |
| download | ffmpeg-e161e007be2ca2df1e560470f94d4038dd841d67.tar.gz | |
Use INIT_VLC_USE_STATIC and not its value "1".
Originally committed as revision 18430 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/msmpeg4.c')
| -rw-r--r-- | libavcodec/msmpeg4.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 3a710aa054..b58deedb5d 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){ |