Rename get_bits1() to get_bit().

[paraslash.git] / bitstream.h

diff --git a/bitstream.h b/bitstream.h
index d13ef4c2bd6946deff17e9104432052b1319b25e..88b62f94032a242ee16fd17400dacf63f75fdb39 100644 (file)
--- a/bitstream.h
+++ b/bitstream.h
@@ -9,11 +9,6 @@
 
 /** \file bitstream.h Bitstream structures and inline functions. */
 
-#define AV_RB32(x)  ((((const uint8_t*)(x))[0] << 24) | \
-                     (((const uint8_t*)(x))[1] << 16) | \
-                     (((const uint8_t*)(x))[2] <<  8) | \
-                      ((const uint8_t*)(x))[3])
-
 /** Structure for bistream I/O. */
 struct getbit_context {
        /* Start of the internal buffer. */
@@ -35,8 +30,9 @@ struct vlc {
 static inline uint32_t show_bits(struct getbit_context *gbc, int num)
 {
        int idx = gbc->index;
-       uint32_t x = AV_RB32(gbc->buffer + (idx >> 3)) << (idx & 7);
-       return x >> (32 - num);
+       const uint8_t *p = gbc->buffer + (idx >> 3);
+       uint32_t x = ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+       return (x << (idx & 7)) >> (32 - num);
 }
 
 static inline int get_bits_count(struct getbit_context *gbc)
@@ -57,7 +53,7 @@ static inline unsigned int get_bits(struct getbit_context *gbc, int n)
 }
 
 /* This is rather hot, we can do better than get_bits(gbc, 1). */
-static inline unsigned int get_bits1(struct getbit_context *gbc)
+static inline unsigned int get_bit(struct getbit_context *gbc)
 {
        int idx = gbc->index++;
        uint8_t tmp = gbc->buffer[idx >> 3], mask = (1 << (7 - (idx & 7)));