X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=bitstream.h;h=553dd04a0737b0c0cac9c845be8a460a13a64ffd;hp=4f94f692b37c97b0f83baac551efc3f7305619c1;hb=1301313c2eb8a9ce0ba8ce22062d1f87fc419aa2;hpb=69adefaebbf29601ed3ba706e00c529e35436c16;ds=sidebyside

diff --git a/bitstream.h b/bitstream.h
index 4f94f692..553dd04a 100644
--- a/bitstream.h
+++ b/bitstream.h
@@ -47,7 +47,7 @@ struct vlc {
  * Refill the internal cache from the bitstream.
  */
 #define UPDATE_CACHE(name, gb)\
-	name##_cache= AV_RB32( ((const uint8_t *)(gb)->buffer) \
+	name##_cache= AV_RB32( ((gb)->buffer) \
 		+ (name##_index >> 3) ) << (name##_index & 0x07);\
 
 /**
@@ -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)
@@ -102,11 +91,7 @@ static inline unsigned int get_bits(struct getbit_context *s, int n)
 
 static inline void skip_bits(struct getbit_context *s, int n)
 {
-	/* gcc seems to optimize this to s->index+=n for the ALT_READER :)) */
-	OPEN_READER(re, s)
-	UPDATE_CACHE(re, s)
-	SKIP_COUNTER(re, s, n)
-	CLOSE_READER(re, s)
+	s->index += n;
 }
 
 static inline unsigned int get_bits1(struct getbit_context *s)
@@ -178,7 +163,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;
 }