projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
open code NEG_USR32
[paraslash.git]
/
bitstream.h
diff --git
a/bitstream.h
b/bitstream.h
index 553dd04a0737b0c0cac9c845be8a460a13a64ffd..6765ed8c4a16f698781c0d8f523920a80ae4d1c5 100644
(file)
--- a/
bitstream.h
+++ b/
bitstream.h
@@
-14,8
+14,6
@@
(((const uint8_t*)(x))[2] << 8) | \
((const uint8_t*)(x))[3])
(((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. */
/** 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. */
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)
{
static inline int get_bits_count(struct getbit_context *s)
{