filter: Make ->open() optional.

[paraslash.git] / bitstream.h

diff --git a/bitstream.h b/bitstream.h
index a3393380e5e02801a4312c6f904c1ea25527aad9..5875b0d090e6e8007d34766ee090950c819188dd 100644 (file)
--- a/bitstream.h
+++ b/bitstream.h
@@ -37,7 +37,7 @@ static inline uint32_t show_bits(struct getbit_context *gbc, int num)
 {
        int idx = gbc->index;
        const uint8_t *p = gbc->buffer + (idx >> 3);
-       uint32_t x = ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
+       uint32_t x = (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
        return (x << (idx & 7)) >> (32 - num);
 }
 
@@ -62,18 +62,20 @@ static inline unsigned int get_bits(struct getbit_context *gbc, int n)
 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)));
+       uint8_t tmp = gbc->buffer[idx >> 3], mask = 1 << (7 - (idx & 7));
        return !!(tmp & mask);
 }
 
 /**
  * Initialize a getbit_context structure.
  *
- * \param buffer The bitstream buffer. It must be 4 bytes larger then the
- * actual read bits because the bitstream reader might read 32 bits at once and
- * could read over the end.
+ * \param gbc The structure to initialize.
+ * \param buffer The bitstream buffer.
+ * \param size The size of the buffer in bytes.
  *
- * \param bit_size The size of the buffer in bytes.
+ * The bitstream buffer must be 4 bytes larger then the actual read bits
+ * because the bitstream reader might read 32 bits at once and could read over
+ * the end.
  */
 static inline void init_get_bits(struct getbit_context *gbc,
                const uint8_t *buffer, int size)
@@ -86,6 +88,4 @@ static inline void init_get_bits(struct getbit_context *gbc,
 void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes, const void *bits,
                const void *codes, int codes_size);
 void free_vlc(struct vlc *vlc);
-int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits,
-               int max_depth);
-
+int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2], int bits);