virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

get_vlc -> get_vlc2 transition and get_vlc() removed from bitstream.h

Browse Source 
Originally committed as revision 4829 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Benjamin Larsson 2006-01-08 21:19:39 +00:00
parent fb9cb0b8c4
commit 946c113046
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/bitstream.h
View File

@ -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()

4
libavcodec/h263.c
View File

@ -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);
}