Mercurial > libavcodec.hg

comparison vc1.c @ 9393:25b3650b4db5 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use INIT_VLC_USE_STATIC and not its value "1".
author cehoyos
date Sat, 11 Apr 2009 11:47:15 +0000
parents 54bc8a2727b0
children 8aa2e86549cd
comparison
equal deleted inserted replaced
9392:a5bc2084bd6a 9393:25b3650b4db5
63 if(!done) 63 if(!done)
64 { 64 {
65 done = 1; 65 done = 1;
66 init_vlc(&ff_vc1_bfraction_vlc, VC1_BFRACTION_VLC_BITS, 23, 66 init_vlc(&ff_vc1_bfraction_vlc, VC1_BFRACTION_VLC_BITS, 23,
67 ff_vc1_bfraction_bits, 1, 1, 67 ff_vc1_bfraction_bits, 1, 1,
68 ff_vc1_bfraction_codes, 1, 1, 1); 68 ff_vc1_bfraction_codes, 1, 1, INIT_VLC_USE_STATIC);
69 init_vlc(&ff_vc1_norm2_vlc, VC1_NORM2_VLC_BITS, 4, 69 init_vlc(&ff_vc1_norm2_vlc, VC1_NORM2_VLC_BITS, 4,
70 ff_vc1_norm2_bits, 1, 1, 70 ff_vc1_norm2_bits, 1, 1,
71 ff_vc1_norm2_codes, 1, 1, 1); 71 ff_vc1_norm2_codes, 1, 1, INIT_VLC_USE_STATIC);
72 init_vlc(&ff_vc1_norm6_vlc, VC1_NORM6_VLC_BITS, 64, 72 init_vlc(&ff_vc1_norm6_vlc, VC1_NORM6_VLC_BITS, 64,
73 ff_vc1_norm6_bits, 1, 1, 73 ff_vc1_norm6_bits, 1, 1,
74 ff_vc1_norm6_codes, 2, 2, 1); 74 ff_vc1_norm6_codes, 2, 2, INIT_VLC_USE_STATIC);
75 init_vlc(&ff_vc1_imode_vlc, VC1_IMODE_VLC_BITS, 7, 75 init_vlc(&ff_vc1_imode_vlc, VC1_IMODE_VLC_BITS, 7,
76 ff_vc1_imode_bits, 1, 1, 76 ff_vc1_imode_bits, 1, 1,
77 ff_vc1_imode_codes, 1, 1, 1); 77 ff_vc1_imode_codes, 1, 1, INIT_VLC_USE_STATIC);
78 for (i=0; i<3; i++) 78 for (i=0; i<3; i++)
79 { 79 {
80 init_vlc(&ff_vc1_ttmb_vlc[i], VC1_TTMB_VLC_BITS, 16, 80 init_vlc(&ff_vc1_ttmb_vlc[i], VC1_TTMB_VLC_BITS, 16,
81 ff_vc1_ttmb_bits[i], 1, 1, 81 ff_vc1_ttmb_bits[i], 1, 1,
82 ff_vc1_ttmb_codes[i], 2, 2, 1); 82 ff_vc1_ttmb_codes[i], 2, 2, INIT_VLC_USE_STATIC);
83 init_vlc(&ff_vc1_ttblk_vlc[i], VC1_TTBLK_VLC_BITS, 8, 83 init_vlc(&ff_vc1_ttblk_vlc[i], VC1_TTBLK_VLC_BITS, 8,
84 ff_vc1_ttblk_bits[i], 1, 1, 84 ff_vc1_ttblk_bits[i], 1, 1,
85 ff_vc1_ttblk_codes[i], 1, 1, 1); 85 ff_vc1_ttblk_codes[i], 1, 1, INIT_VLC_USE_STATIC);
86 init_vlc(&ff_vc1_subblkpat_vlc[i], VC1_SUBBLKPAT_VLC_BITS, 15, 86 init_vlc(&ff_vc1_subblkpat_vlc[i], VC1_SUBBLKPAT_VLC_BITS, 15,
87 ff_vc1_subblkpat_bits[i], 1, 1, 87 ff_vc1_subblkpat_bits[i], 1, 1,
88 ff_vc1_subblkpat_codes[i], 1, 1, 1); 88 ff_vc1_subblkpat_codes[i], 1, 1, INIT_VLC_USE_STATIC);
89 } 89 }
90 for(i=0; i<4; i++) 90 for(i=0; i<4; i++)
91 { 91 {
92 init_vlc(&ff_vc1_4mv_block_pattern_vlc[i], VC1_4MV_BLOCK_PATTERN_VLC_BITS, 16, 92 init_vlc(&ff_vc1_4mv_block_pattern_vlc[i], VC1_4MV_BLOCK_PATTERN_VLC_BITS, 16,
93 ff_vc1_4mv_block_pattern_bits[i], 1, 1, 93 ff_vc1_4mv_block_pattern_bits[i], 1, 1,
94 ff_vc1_4mv_block_pattern_codes[i], 1, 1, 1); 94 ff_vc1_4mv_block_pattern_codes[i], 1, 1, INIT_VLC_USE_STATIC);
95 init_vlc(&ff_vc1_cbpcy_p_vlc[i], VC1_CBPCY_P_VLC_BITS, 64, 95 init_vlc(&ff_vc1_cbpcy_p_vlc[i], VC1_CBPCY_P_VLC_BITS, 64,
96 ff_vc1_cbpcy_p_bits[i], 1, 1, 96 ff_vc1_cbpcy_p_bits[i], 1, 1,
97 ff_vc1_cbpcy_p_codes[i], 2, 2, 1); 97 ff_vc1_cbpcy_p_codes[i], 2, 2, INIT_VLC_USE_STATIC);
98 init_vlc(&ff_vc1_mv_diff_vlc[i], VC1_MV_DIFF_VLC_BITS, 73, 98 init_vlc(&ff_vc1_mv_diff_vlc[i], VC1_MV_DIFF_VLC_BITS, 73,
99 ff_vc1_mv_diff_bits[i], 1, 1, 99 ff_vc1_mv_diff_bits[i], 1, 1,
100 ff_vc1_mv_diff_codes[i], 2, 2, 1); 100 ff_vc1_mv_diff_codes[i], 2, 2, INIT_VLC_USE_STATIC);
101 } 101 }
102 for(i=0; i<8; i++) 102 for(i=0; i<8; i++)
103 init_vlc(&ff_vc1_ac_coeff_table[i], AC_VLC_BITS, vc1_ac_sizes[i], 103 init_vlc(&ff_vc1_ac_coeff_table[i], AC_VLC_BITS, vc1_ac_sizes[i],
104 &vc1_ac_tables[i][0][1], 8, 4, 104 &vc1_ac_tables[i][0][1], 8, 4,
105 &vc1_ac_tables[i][0][0], 8, 4, 1); 105 &vc1_ac_tables[i][0][0], 8, 4, INIT_VLC_USE_STATIC);
106 init_vlc(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64, 106 init_vlc(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64,
107 &ff_msmp4_mb_i_table[0][1], 4, 2, 107 &ff_msmp4_mb_i_table[0][1], 4, 2,
108 &ff_msmp4_mb_i_table[0][0], 4, 2, 1); 108 &ff_msmp4_mb_i_table[0][0], 4, 2, INIT_VLC_USE_STATIC);
109 } 109 }
110 110
111 /* Other defaults */ 111 /* Other defaults */
112 v->pq = -1; 112 v->pq = -1;
113 v->mvrange = 0; /* 7.1.1.18, p80 */ 113 v->mvrange = 0; /* 7.1.1.18, p80 */