[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec bitstream.h, 1.158, 1.159 h263.c, 1.296, 1.297

Benjamin Larsson CVS banan
Sun Jan 8 22:19:43 CET 2006


Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv15485/libavcodec

Modified Files:
	bitstream.h h263.c 
Log Message:
get_vlc -> get_vlc2 transition and get_vlc() removed from bitstream.h


Index: bitstream.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/bitstream.h,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- bitstream.h	22 Dec 2005 01:10:06 -0000	1.158
+++ bitstream.h	8 Jan 2006 21:19:39 -0000	1.159
@@ -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()

Index: h263.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h263.c,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- h263.c	24 Dec 2005 03:12:06 -0000	1.296
+++ h263.c	8 Jan 2006 21:19:39 -0000	1.297
@@ -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);
         }





More information about the ffmpeg-cvslog mailing list