Remove name parameter from GET_VLC.

diff --git a/bitstream.h b/bitstream.h
index e89ae1360d984c5979241061989153376ae80210..fe85aba7475684168d13b0f3614c93953f7d957e 100644 (file)
--- a/bitstream.h
+++ b/bitstream.h
@@ -157,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
  */
  * 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;\
 \
 {\
     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){\
     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;\
 \
 \
         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){\
         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;\
 \
 \
             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];\
         }\
     }\
             code = table[index][0];\
             n    = table[index][1];\
         }\
     }\

-    SKIP_BITS(name, gb, n)\
+    SKIP_BITS(re, gb, n)\

 }
 }

diff --git a/wmadec_filter.c b/wmadec_filter.c
index d79df975450f057c4db49f2f0ad9ccd6a50e0cf6..67791a6036456655f3eba3184e9777884623dea9 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -590,7 +590,7 @@ static int get_vlc2(struct getbit_context *s, VLC_TYPE(*table)[2],
 
        OPEN_READER(re, s)
        UPDATE_CACHE(re, s)
 
        OPEN_READER(re, s)
        UPDATE_CACHE(re, s)

-       GET_VLC(code, re, s, table, bits, max_depth)
+       GET_VLC(code, s, table, bits, max_depth)

        CLOSE_READER(re, s)
        return code;
 }
        CLOSE_READER(re, s)
        return code;
 }