diff options
| -rw-r--r-- | libavcodec/bitstream.h | 14 | ||||
| -rw-r--r-- | libavcodec/h263.c | 4 |
2 files changed, 2 insertions, 16 deletions
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 8e70069fd2..4a3d55d19b 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -790,20 +790,6 @@ void free_vlc(VLC *vlc); 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 --git a/libavcodec/h263.c b/libavcodec/h263.c index d3c72d132c..a502db0159 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -5278,13 +5278,13 @@ static void mpeg4_decode_sprite_trajectory(MpegEncContext * s, GetBitContext *gb 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); } |