From 956447747dd1edd56da4904851b55bfac06d6c3e Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 18 Oct 2009 21:06:12 +0200 Subject: [PATCH 1/1] open code NEG_USR32 --- bitstream.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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) { -- 2.39.2