diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-05-30 20:02:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-05-30 20:02:59 +0000 |
| commit | f76605e88082583c852ed8c18498193129689697 (patch) | |
| tree | 5e3068ee5fa24859af08f44a32a3cdb1398bcf88 /libavcodec/mpeg12.c | |
| parent | d05b24ff89474b8701d4bedba803120c676c642f (diff) | |
| download | ffmpeg-f76605e88082583c852ed8c18498193129689697.tar.gz | |
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 ...
Originally committed as revision 13563 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 8133b1d267..bfae79a6eb 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -156,28 +156,28 @@ static void init_vlcs(void) if (!done) { done = 1; - init_vlc(&dc_lum_vlc, DC_VLC_BITS, 12, + INIT_VLC_STATIC(&dc_lum_vlc, DC_VLC_BITS, 12, ff_mpeg12_vlc_dc_lum_bits, 1, 1, - ff_mpeg12_vlc_dc_lum_code, 2, 2, 1); - init_vlc(&dc_chroma_vlc, DC_VLC_BITS, 12, + ff_mpeg12_vlc_dc_lum_code, 2, 2, 512); + INIT_VLC_STATIC(&dc_chroma_vlc, DC_VLC_BITS, 12, ff_mpeg12_vlc_dc_chroma_bits, 1, 1, - ff_mpeg12_vlc_dc_chroma_code, 2, 2, 1); - init_vlc(&mv_vlc, MV_VLC_BITS, 17, + ff_mpeg12_vlc_dc_chroma_code, 2, 2, 514); + INIT_VLC_STATIC(&mv_vlc, MV_VLC_BITS, 17, &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1, - &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 1); - init_vlc(&mbincr_vlc, MBINCR_VLC_BITS, 36, + &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 518); + INIT_VLC_STATIC(&mbincr_vlc, MBINCR_VLC_BITS, 36, &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1, - &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 1); - init_vlc(&mb_pat_vlc, MB_PAT_VLC_BITS, 64, + &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 538); + INIT_VLC_STATIC(&mb_pat_vlc, MB_PAT_VLC_BITS, 64, &ff_mpeg12_mbPatTable[0][1], 2, 1, - &ff_mpeg12_mbPatTable[0][0], 2, 1, 1); + &ff_mpeg12_mbPatTable[0][0], 2, 1, 512); - init_vlc(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7, + INIT_VLC_STATIC(&mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7, &table_mb_ptype[0][1], 2, 1, - &table_mb_ptype[0][0], 2, 1, 1); - init_vlc(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 11, + &table_mb_ptype[0][0], 2, 1, 64); + INIT_VLC_STATIC(&mb_btype_vlc, MB_BTYPE_VLC_BITS, 11, &table_mb_btype[0][1], 2, 1, - &table_mb_btype[0][0], 2, 1, 1); + &table_mb_btype[0][0], 2, 1, 64); init_rl(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]); init_rl(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]); |