remove pointless cast

[paraslash.git] / bitstream.h

diff --git a/bitstream.h b/bitstream.h
index f54ae62bc6b132c26c15312e117e69508557bb6c..d052337c1a1825d29bc700c8a918177220dc4f74 100644 (file)
--- a/bitstream.h
+++ b/bitstream.h
@@ -47,7 +47,7 @@ struct vlc {
  * Refill the internal cache from the bitstream.
  */
 #define UPDATE_CACHE(name, gb)\
  * Refill the internal cache from the bitstream.
  */
 #define UPDATE_CACHE(name, gb)\

-       name##_cache= AV_RB32( ((const uint8_t *)(gb)->buffer) \
+       name##_cache= AV_RB32( ((gb)->buffer) \

                + (name##_index >> 3) ) << (name##_index & 0x07);\
 
 /**
                + (name##_index >> 3) ) << (name##_index & 0x07);\
 
 /**


@@ -128,18 +128,13 @@ static inline unsigned int get_bits1(struct getbit_context *s)
  * bytes larger then the actual read bits * because some optimized bitstream
  * readers read 32 or 64 bit at once and could read over the end.
  *
  * bytes larger then the actual read bits * because some optimized bitstream
  * readers read 32 or 64 bit at once and could read over the end.
  *

- * \param bit_size The size of the buffer in bits.
+ * \param bit_size The size of the buffer in bytes.

  */
 static inline void init_get_bits(struct getbit_context *s,
  */
 static inline void init_get_bits(struct getbit_context *s,

-               const uint8_t *buffer, int bit_size)
+               const uint8_t *buffer, int size)

 {
 {

-       int buffer_size = (bit_size + 7) >> 3;
-       if (buffer_size < 0 || bit_size < 0) {
-               buffer_size = bit_size = 0;
-               buffer = NULL;
-       }

        s->buffer = buffer;
        s->buffer = buffer;

-       s->buffer_end = buffer + buffer_size;
+       s->buffer_end = buffer + size;

        s->index = 0;
 }
 
        s->index = 0;
 }