diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-08-22 14:37:39 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-09-05 13:55:03 +0200 |
| commit | b574e1e97ea7067a5fcd3876e30a67df0e4e6611 (patch) | |
| tree | e57486f90e339c13f66fc84331eddb5773f8b804 /libavcodec/get_bits.h | |
| parent | b21e989a3c076d94cfdde0303724db841dd60cad (diff) | |
get_bits: Add OPEN_READER macro variant w/o size_plus8
This avoids a trillion warnings from MSVC.
Diffstat (limited to 'libavcodec/get_bits.h')
| -rw-r--r-- | libavcodec/get_bits.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index f1962f29d5..b7c68e1b9f 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -123,17 +123,18 @@ typedef struct RL_VLC_ELEM { # define MIN_CACHE_BITS 25 #endif -#if UNCHECKED_BITSTREAM_READER -#define OPEN_READER(name, gb) \ +#define OPEN_READER_NOSIZE(name, gb) \ unsigned int name ## _index = (gb)->index; \ unsigned int av_unused name ## _cache = 0 +#if UNCHECKED_BITSTREAM_READER +#define OPEN_READER(name, gb) OPEN_READER_NOSIZE(name, gb) + #define BITS_AVAILABLE(name, gb) 1 #else #define OPEN_READER(name, gb) \ - unsigned int name ## _index = (gb)->index; \ - unsigned int av_unused name ## _cache = 0; \ - unsigned int av_unused name ## _size_plus8 = (gb)->size_in_bits_plus8 + OPEN_READER_NOSIZE(name, gb); \ + unsigned int name ## _size_plus8 = (gb)->size_in_bits_plus8 #define BITS_AVAILABLE(name, gb) name ## _index < name ## _size_plus8 #endif @@ -254,7 +255,7 @@ static inline unsigned int get_bits(GetBitContext *s, int n) static inline unsigned int show_bits(GetBitContext *s, int n) { register int tmp; - OPEN_READER(re, s); + OPEN_READER_NOSIZE(re, s); UPDATE_CACHE(re, s); tmp = SHOW_UBITS(re, s, n); return tmp; |