Mercurial > libavcodec.hg

comparison svq1dec.c @ 10262:0eed6587903b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace last use of INIT_VLC_USE_STATIC by INIT_VLC_USE_NEW_STATIC in svq1dec
author reimar
date Thu, 24 Sep 2009 15:12:05 +0000
parents 21add4db7e53
children 0a6fc654cfb6
comparison
equal deleted inserted replaced
10261:64ee90bc6c31 10262:0eed6587903b
766 766
767 static av_cold int svq1_decode_init(AVCodecContext *avctx) 767 static av_cold int svq1_decode_init(AVCodecContext *avctx)
768 { 768 {
769 MpegEncContext *s = avctx->priv_data; 769 MpegEncContext *s = avctx->priv_data;
770 int i; 770 int i;
771 int offset = 0;
771 772
772 MPV_decode_defaults(s); 773 MPV_decode_defaults(s);
773 774
774 s->avctx = avctx; 775 s->avctx = avctx;
775 s->width = (avctx->width+3)&~3; 776 s->width = (avctx->width+3)&~3;
787 INIT_VLC_STATIC(&svq1_motion_component, 7, 33, 788 INIT_VLC_STATIC(&svq1_motion_component, 7, 33,
788 &mvtab[0][1], 2, 1, 789 &mvtab[0][1], 2, 1,
789 &mvtab[0][0], 2, 1, 176); 790 &mvtab[0][0], 2, 1, 176);
790 791
791 for (i = 0; i < 6; i++) { 792 for (i = 0; i < 6; i++) {
793 static const uint8_t sizes[2][6] = {{14, 10, 14, 18, 16, 18}, {10, 10, 14, 14, 14, 16}};
794 static VLC_TYPE table[168][2];
795 svq1_intra_multistage[i].table = &table[offset];
796 svq1_intra_multistage[i].table_allocated = sizes[0][i];
797 offset += sizes[0][i];
792 init_vlc(&svq1_intra_multistage[i], 3, 8, 798 init_vlc(&svq1_intra_multistage[i], 3, 8,
793 &ff_svq1_intra_multistage_vlc[i][0][1], 2, 1, 799 &ff_svq1_intra_multistage_vlc[i][0][1], 2, 1,
794 &ff_svq1_intra_multistage_vlc[i][0][0], 2, 1, INIT_VLC_USE_STATIC); 800 &ff_svq1_intra_multistage_vlc[i][0][0], 2, 1, INIT_VLC_USE_NEW_STATIC);
801 svq1_inter_multistage[i].table = &table[offset];
802 svq1_inter_multistage[i].table_allocated = sizes[1][i];
803 offset += sizes[1][i];
795 init_vlc(&svq1_inter_multistage[i], 3, 8, 804 init_vlc(&svq1_inter_multistage[i], 3, 8,
796 &ff_svq1_inter_multistage_vlc[i][0][1], 2, 1, 805 &ff_svq1_inter_multistage_vlc[i][0][1], 2, 1,
797 &ff_svq1_inter_multistage_vlc[i][0][0], 2, 1, INIT_VLC_USE_STATIC); 806 &ff_svq1_inter_multistage_vlc[i][0][0], 2, 1, INIT_VLC_USE_NEW_STATIC);
798 } 807 }
799 808
800 INIT_VLC_STATIC(&svq1_intra_mean, 8, 256, 809 INIT_VLC_STATIC(&svq1_intra_mean, 8, 256,
801 &ff_svq1_intra_mean_vlc[0][1], 4, 2, 810 &ff_svq1_intra_mean_vlc[0][1], 4, 2,
802 &ff_svq1_intra_mean_vlc[0][0], 4, 2, 632); 811 &ff_svq1_intra_mean_vlc[0][0], 4, 2, 632);