From: Andre Noll <maan@systemlinux.org>
Date: Sun, 18 Oct 2009 18:42:09 +0000 (+0200)
Subject: Open code SKIP_BITS
X-Git-Tag: v0.4.1~63
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=d0e242668ea2741d10b53e9dd53170180c9f5d24;p=paraslash.git

Open code SKIP_BITS
---

diff --git a/bitstream.h b/bitstream.h
index d052337c..186f6376 100644
--- a/bitstream.h
+++ b/bitstream.h
@@ -61,22 +61,11 @@ struct vlc {
 /**
  * Increment the internal bit counter.
  *
- * \sa SKIP_CACHE, SKIP_BITS.
+ * \sa SKIP_CACHE.
  */
 #define SKIP_COUNTER(name, gb, num)\
 	name##_index += (num);\
 
-/**
- * Skip over the next num bits.
- *
- * This is equivalent to SKIP_CACHE; SKIP_COUNTER.
- */
-#define SKIP_BITS(name, gb, num)\
-	{\
-		SKIP_CACHE(name, gb, num)\
-		SKIP_COUNTER(name, gb, num)\
-	}\
-
 /** Return the next num bits. */
 #define SHOW_UBITS(name, gb, num)\
 	NEG_USR32(name##_cache, num)
@@ -178,7 +167,8 @@ static inline int get_vlc(struct getbit_context *gb, VLC_TYPE(*table)[2],
 			n = table[idx][1];
 		}
 	}
-	SKIP_BITS(re, gb, n)
+	SKIP_CACHE(re, gb, n)
+	SKIP_COUNTER(re, gb, n)
 	CLOSE_READER(re, gb)
 	return code;
 }