Remove name parameter from GET_VLC.

[paraslash.git] / bitstream.h

diff --git a/bitstream.h b/bitstream.h
index 07c65389081d9b4b979c5c556dc5e1a9d4ce75f1..fe85aba7475684168d13b0f3614c93953f7d957e 100644 (file)
--- a/bitstream.h
+++ b/bitstream.h
@@ -103,18 +103,6 @@ static inline unsigned int get_bits(struct getbit_context *s, int n)
        return tmp;
 }
 
-/**
- * Show 1-17 bits.
- */
-static inline unsigned int show_bits(struct getbit_context *s, int n)
-{
-       register int tmp;
-       OPEN_READER(re, s)
-       UPDATE_CACHE(re, s)
-       tmp = SHOW_UBITS(re, s, n);
-       return tmp;
-}
-
 static inline void skip_bits(struct getbit_context *s, int n)
 {
        /* gcc seems to optimize this to s->index+=n for the ALT_READER :)) */
@@ -169,33 +157,33 @@ void free_vlc(struct vlc *vlc);
  * if the vlc code is invalid and max_depth>1 than the number of bits removed
  * is undefined
  */
-#define GET_VLC(code, name, gb, table, bits, max_depth)\
+#define GET_VLC(code, gb, table, bits, max_depth)\
 {\
     int n, index, nb_bits;\
 \
-    index= SHOW_UBITS(name, gb, bits);\
+    index= SHOW_UBITS(re, gb, bits);\
     code = table[index][0];\
     n    = table[index][1];\
 \
     if(max_depth > 1 && n < 0){\
-        LAST_SKIP_BITS(name, gb, bits)\
-        UPDATE_CACHE(name, gb)\
+        LAST_SKIP_BITS(re, gb, bits)\
+        UPDATE_CACHE(re, gb)\
 \
         nb_bits = -n;\
 \
-        index= SHOW_UBITS(name, gb, nb_bits) + code;\
+        index= SHOW_UBITS(re, gb, nb_bits) + code;\
         code = table[index][0];\
         n    = table[index][1];\
         if(max_depth > 2 && n < 0){\
-            LAST_SKIP_BITS(name, gb, nb_bits)\
-            UPDATE_CACHE(name, gb)\
+            LAST_SKIP_BITS(re, gb, nb_bits)\
+            UPDATE_CACHE(re, gb)\
 \
             nb_bits = -n;\
 \
-            index= SHOW_UBITS(name, gb, nb_bits) + code;\
+            index= SHOW_UBITS(re, gb, nb_bits) + code;\
             code = table[index][0];\
             n    = table[index][1];\
         }\
     }\
-    SKIP_BITS(name, gb, n)\
+    SKIP_BITS(re, gb, n)\
 }