# HG changeset patch # User reimar # Date 1253785491 0 # Node ID 21add4db7e53bce7cc75abf7cf4181ea2d429b9f # Parent 6829e70ef3aaee5c6df3d32c3c49a7f7262a6cf5 Use INIT_VLC_STATIC where easily possible in svq1dec diff -r 6829e70ef3aa -r 21add4db7e53 svq1dec.c --- a/svq1dec.c Thu Sep 24 06:33:16 2009 +0000 +++ b/svq1dec.c Thu Sep 24 09:44:51 2009 +0000 @@ -780,13 +780,13 @@ s->flags= avctx->flags; if (MPV_common_init(s) < 0) return -1; - init_vlc(&svq1_block_type, 2, 4, + INIT_VLC_STATIC(&svq1_block_type, 2, 4, &ff_svq1_block_type_vlc[0][1], 2, 1, - &ff_svq1_block_type_vlc[0][0], 2, 1, INIT_VLC_USE_STATIC); + &ff_svq1_block_type_vlc[0][0], 2, 1, 6); - init_vlc(&svq1_motion_component, 7, 33, + INIT_VLC_STATIC(&svq1_motion_component, 7, 33, &mvtab[0][1], 2, 1, - &mvtab[0][0], 2, 1, INIT_VLC_USE_STATIC); + &mvtab[0][0], 2, 1, 176); for (i = 0; i < 6; i++) { init_vlc(&svq1_intra_multistage[i], 3, 8, @@ -797,13 +797,13 @@ &ff_svq1_inter_multistage_vlc[i][0][0], 2, 1, INIT_VLC_USE_STATIC); } - init_vlc(&svq1_intra_mean, 8, 256, + INIT_VLC_STATIC(&svq1_intra_mean, 8, 256, &ff_svq1_intra_mean_vlc[0][1], 4, 2, - &ff_svq1_intra_mean_vlc[0][0], 4, 2, INIT_VLC_USE_STATIC); + &ff_svq1_intra_mean_vlc[0][0], 4, 2, 632); - init_vlc(&svq1_inter_mean, 9, 512, + INIT_VLC_STATIC(&svq1_inter_mean, 9, 512, &ff_svq1_inter_mean_vlc[0][1], 4, 2, - &ff_svq1_inter_mean_vlc[0][0], 4, 2, INIT_VLC_USE_STATIC); + &ff_svq1_inter_mean_vlc[0][0], 4, 2, 1434); return 0; }