comparison mpeg12.c @ 6937:966b86c01ade libavcodec

Switch to INIT_VLC_USE_NEW_STATIC. Note, if code you maintain still uses INIT_VLC_USE_STATIC please change it as well! Iam not volunteering to clean all codecs up ...
author michael
date Fri, 30 May 2008 20:02:59 +0000
parents e627df327e77
children 5096176df88c
comparison
equal deleted inserted replaced
6936:97798862a414 6937:966b86c01ade
154 static int done = 0; 154 static int done = 0;
155 155
156 if (!done) { 156 if (!done) {
157 done = 1; 157 done = 1;
158 158
159 init_vlc(&dc_lum_vlc, DC_VLC_BITS, 12, 159 INIT_VLC_STATIC(&dc_lum_vlc, DC_VLC_BITS, 12,
160 ff_mpeg12_vlc_dc_lum_bits, 1, 1, 160 ff_mpeg12_vlc_dc_lum_bits, 1, 1,
161 ff_mpeg12_vlc_dc_lum_code, 2, 2, 1); 161 ff_mpeg12_vlc_dc_lum_code, 2, 2, 512);
162 init_vlc(&dc_chroma_vlc, DC_VLC_BITS, 12, 162 INIT_VLC_STATIC(&dc_chroma_vlc, DC_VLC_BITS, 12,
163 ff_mpeg12_vlc_dc_chroma_bits, 1, 1, 163 ff_mpeg12_vlc_dc_chroma_bits, 1, 1,
164 ff_mpeg12_vlc_dc_chroma_code, 2, 2, 1); 164 ff_mpeg12_vlc_dc_chroma_code, 2, 2, 514);
165 init_vlc(&mv_vlc, MV_VLC_BITS, 17, 165 INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 17,
166 &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1, 166 &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1,
167 &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 1); 167 &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 518);
168 init_vlc(&mbincr_vlc, MBINCR_VLC_BITS, 36, 168 INIT_VLC_STATIC(&mbincr_vlc, MBINCR_VLC_BITS, 36,
169 &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1, 169 &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1,
170 &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 1); 170 &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 538);
171 init_vlc(&mb_pat_vlc, MB_PAT_VLC_BITS, 64, 171 INIT_VLC_STATIC(&mb_pat_vlc, MB_PAT_VLC_BITS, 64,
172 &ff_mpeg12_mbPatTable[0][1], 2, 1, 172 &ff_mpeg12_mbPatTable[0][1], 2, 1,
173 &ff_mpeg12_mbPatTable[0][0], 2, 1, 1); 173 &ff_mpeg12_mbPatTable[0][0], 2, 1, 512);
174 174
175 init_vlc(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7, 175 INIT_VLC_STATIC(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7,
176 &table_mb_ptype[0][1], 2, 1, 176 &table_mb_ptype[0][1], 2, 1,
177 &table_mb_ptype[0][0], 2, 1, 1); 177 &table_mb_ptype[0][0], 2, 1, 64);
178 init_vlc(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 11, 178 INIT_VLC_STATIC(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 11,
179 &table_mb_btype[0][1], 2, 1, 179 &table_mb_btype[0][1], 2, 1,
180 &table_mb_btype[0][0], 2, 1, 1); 180 &table_mb_btype[0][0], 2, 1, 64);
181 init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]); 181 init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]);
182 init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]); 182 init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]);
183 183
184 init_2d_vlc_rl(&ff_rl_mpeg1, 1); 184 init_2d_vlc_rl(&ff_rl_mpeg1, 1);
185 init_2d_vlc_rl(&ff_rl_mpeg2, 1); 185 init_2d_vlc_rl(&ff_rl_mpeg2, 1);