# HG changeset patch # User banan # Date 1136755179 0 # Node ID 67d3bb5a4ce16f3e99eba379679e086385039b89 # Parent 80fc42ba85b7a930ccf7c0a8f0a0d49818f87483 get_vlc -> get_vlc2 transition and get_vlc() removed from bitstream.h diff -r 80fc42ba85b7 -r 67d3bb5a4ce1 bitstream.h --- a/bitstream.h Sun Jan 08 19:31:21 2006 +0000 +++ b/bitstream.h Sun Jan 08 21:19:39 2006 +0000 @@ -790,20 +790,6 @@ SKIP_BITS(name, gb, n)\ } -// deprecated, dont use get_vlc for new code, use get_vlc2 instead or use GET_VLC directly -static inline int get_vlc(GetBitContext *s, VLC *vlc) -{ - int code; - VLC_TYPE (*table)[2]= vlc->table; - - OPEN_READER(re, s) - UPDATE_CACHE(re, s) - - GET_VLC(code, re, s, table, vlc->bits, 3) - - CLOSE_READER(re, s) - return code; -} /** * parses a vlc code, faster then get_vlc() diff -r 80fc42ba85b7 -r 67d3bb5a4ce1 h263.c --- a/h263.c Sun Jan 08 19:31:21 2006 +0000 +++ b/h263.c Sun Jan 08 21:19:39 2006 +0000 @@ -5278,13 +5278,13 @@ int length; int x=0, y=0; - length= get_vlc(gb, &sprite_trajectory); + length= get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3); if(length){ x= get_xbits(gb, length); } if(!(s->divx_version==500 && s->divx_build==413)) skip_bits1(gb); /* marker bit */ - length= get_vlc(gb, &sprite_trajectory); + length= get_vlc2(gb, sprite_trajectory.table, SPRITE_TRAJ_VLC_BITS, 3); if(length){ y=get_xbits(gb, length); }