From: Andre Noll <maan@systemlinux.org>
Date: Sun, 18 Oct 2009 19:06:12 +0000 (+0200)
Subject: open code NEG_USR32
X-Git-Tag: v0.4.1~61
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=956447747dd1edd56da4904851b55bfac06d6c3e;hp=1301313c2eb8a9ce0ba8ce22062d1f87fc419aa2

open code NEG_USR32
---

diff --git a/bitstream.h b/bitstream.h
index 553dd04a..6765ed8c 100644
--- a/bitstream.h
+++ b/bitstream.h
@@ -14,8 +14,6 @@
                      (((const uint8_t*)(x))[2] <<  8) | \
                       ((const uint8_t*)(x))[3])
 
-#define NEG_USR32(a,s) (((uint32_t)(a))>>(32-(s)))
-
 /** Structure for bistream I/O. */
 struct getbit_context {
 	/* Start of the internal buffer. */
@@ -67,8 +65,8 @@ struct vlc {
 	name##_index += (num);\
 
 /** Return the next num bits. */
-#define SHOW_UBITS(name, gb, num)\
-	NEG_USR32(name##_cache, num)
+#define SHOW_UBITS(name, gb, num) \
+	(((uint32_t)(name##_cache)) >> (32 - (num)))
 
 static inline int get_bits_count(struct getbit_context *s)
 {