Always call getbit_context structures gbc.

diff --git a/bitstream.h b/bitstream.h
index 7f944dbf3b79f57088f8ef180cf6d0d7efa76617..cc56a83c0207c2abc9c6fd25e9e9fd1aa4c5bb7d 100644 (file)
--- a/bitstream.h
+++ b/bitstream.h
@@ -39,14 +39,14 @@ static inline uint32_t show_bits(struct getbit_context *gbc, int num)
        return x >> (32 - num);
 }
 
-static inline int get_bits_count(struct getbit_context *s)
+static inline int get_bits_count(struct getbit_context *gbc)
 {
-       return s->index;
+       return gbc->index;
 }
 
-static inline void skip_bits(struct getbit_context *s, int n)
+static inline void skip_bits(struct getbit_context *gbc, int n)
 {
-       s->index += n;
+       gbc->index += n;
 }
 
 static inline unsigned int get_bits(struct getbit_context *gbc, int n)
@@ -56,15 +56,15 @@ static inline unsigned int get_bits(struct getbit_context *gbc, int n)
        return ret;
 }
 
-static inline unsigned int get_bits1(struct getbit_context *s)
+static inline unsigned int get_bits1(struct getbit_context *gbc)
 {
-       int idx = s->index;
-       uint8_t result = s->buffer[idx >> 3];
+       int idx = gbc->index;
+       uint8_t result = gbc->buffer[idx >> 3];
 
        result <<= (idx & 0x07);
        result >>= 8 - 1;
        idx++;
-       s->index = idx;
+       gbc->index = idx;
        return result;
 }
 
@@ -77,12 +77,12 @@ static inline unsigned int get_bits1(struct getbit_context *s)
  *
  * \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 *gbc,
                const uint8_t *buffer, int size)
 {
-       s->buffer = buffer;
-       s->buffer_end = buffer + size;
-       s->index = 0;
+       gbc->buffer = buffer;
+       gbc->buffer_end = buffer + size;
+       gbc->index = 0;
 }
 
 void init_vlc(struct vlc *vlc, int nb_bits, int nb_codes, const void *bits,
@@ -99,28 +99,28 @@ void free_vlc(struct vlc *vlc);
  * \param max_depth The number of times bits bits must be read to completely
  * read the longest vlc code = (max_vlc_length + bits - 1) / bits.
  */
-static inline int get_vlc(struct getbit_context *gb, VLC_TYPE(*table)[2],
+static inline int get_vlc(struct getbit_context *gbc, VLC_TYPE(*table)[2],
                int bits, int max_depth)
 {
        int n, idx, nb_bits, code;
 
-       idx = show_bits(gb, bits);
+       idx = show_bits(gbc, bits);
        code = table[idx][0];
        n = table[idx][1];
        if (max_depth > 1 && n < 0) {
-               skip_bits(gb, bits);
+               skip_bits(gbc, bits);
                nb_bits = -n;
-               idx = show_bits(gb, nb_bits) + code;
+               idx = show_bits(gbc, nb_bits) + code;
                code = table[idx][0];
                n = table[idx][1];
                if (max_depth > 2 && n < 0) {
-                       skip_bits(gb, nb_bits);
+                       skip_bits(gbc, nb_bits);
                        nb_bits = -n;
-                       idx = show_bits(gb, nb_bits) + code;
+                       idx = show_bits(gbc, nb_bits) + code;
                        code = table[idx][0];
                        n = table[idx][1];
                }
        }
-       skip_bits(gb, n);
+       skip_bits(gbc, n);
        return code;
 }