diff options
| author | James Almer <jamrial@gmail.com> | 2018-08-30 22:36:55 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2018-08-30 22:47:31 +0200 |
| commit | 9305bdc68f0976e0c5870f0d0557a45fe13bb0f6 (patch) | |
| tree | aa8e2536461ab6f42147586566ada01ea1303556 /libavcodec/golomb.h | |
| parent | 6b1b5af0240b24274f52963a2bac0f9a6d78304a (diff) | |
| download | ffmpeg-9305bdc68f0976e0c5870f0d0557a45fe13bb0f6.tar.gz | |
avcodec/get_bits: actually make cached reader correctly disabled
Diffstat (limited to 'libavcodec/golomb.h')
| -rw-r--r-- | libavcodec/golomb.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index e66675b292..5c25883626 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -54,7 +54,7 @@ static inline int get_ue_golomb(GetBitContext *gb) { unsigned int buf; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); if (buf >= (1 << 27)) { @@ -119,7 +119,7 @@ static inline int get_ue_golomb_31(GetBitContext *gb) { unsigned int buf; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); buf >>= 32 - 9; @@ -142,7 +142,7 @@ static inline unsigned get_interleaved_ue_golomb(GetBitContext *gb) { uint32_t buf; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); if (buf & 0xAA800000) { @@ -238,7 +238,7 @@ static inline int get_se_golomb(GetBitContext *gb) { unsigned int buf; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); if (buf >= (1 << 27)) { @@ -300,7 +300,7 @@ static inline int get_interleaved_se_golomb(GetBitContext *gb) { unsigned int buf; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); if (buf & 0xAA800000) { @@ -375,7 +375,7 @@ static inline int get_ur_golomb(GetBitContext *gb, int k, int limit, unsigned int buf; int log; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); log = av_log2(buf); @@ -429,7 +429,7 @@ static inline int get_ur_golomb_jpegls(GetBitContext *gb, int k, int limit, unsigned int buf; int log; -#ifdef CACHED_BITSTREAM_READER +#if CACHED_BITSTREAM_READER buf = show_bits_long(gb, 32); log = av_log2(buf); |