diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 19:08:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-05 19:08:27 +0200 |
| commit | 8c6cfffa01b27afde8bb983c6421611e07688aa6 (patch) | |
| tree | 9ad90ef8c99c7999a2dd38b51a24ef3d7f5e5e7c /libavcodec | |
| parent | 7865cafec295b545f6a2b813ca7539086917e513 (diff) | |
| parent | b574e1e97ea7067a5fcd3876e30a67df0e4e6611 (diff) | |
| download | ffmpeg-8c6cfffa01b27afde8bb983c6421611e07688aa6.tar.gz | |
Merge commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611'
* commit 'b574e1e97ea7067a5fcd3876e30a67df0e4e6611':
get_bits: Add OPEN_READER macro variant w/o size_plus8
Conflicts:
libavcodec/get_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dvdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/get_bits.h | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index fbd158f7d2..e759c91424 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -96,7 +96,7 @@ static void dv_decode_ac(GetBitContext *gb, BlockInfo *mb, int16_t *block) int partial_bit_count = mb->partial_bit_count; int level, run, vlc_len, index; - OPEN_READER(re, gb); + OPEN_READER_NOSIZE(re, gb); UPDATE_CACHE(re, gb); /* if we must parse a partial VLC, we do it here */ diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 02f850cee6..b9dec4fe35 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -125,17 +125,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 +#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 @@ -286,7 +287,7 @@ static inline unsigned int get_bits_le(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); av_assert2(n>0 && n<=25); UPDATE_CACHE(re, s); tmp = SHOW_UBITS(re, s, n); |