X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=bitstream.h;fp=bitstream.h;h=fe85aba7475684168d13b0f3614c93953f7d957e;hb=18651668774f785d38189eee9d8389fe69428380;hp=e89ae1360d984c5979241061989153376ae80210;hpb=d4b77deab0304c7ba0a02a27b4b01e6af8334cbb;p=paraslash.git diff --git a/bitstream.h b/bitstream.h index e89ae136..fe85aba7 100644 --- 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 */ -#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)\ }