From 9305bdc68f0976e0c5870f0d0557a45fe13bb0f6 Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 30 Aug 2018 22:36:55 +0200 Subject: avcodec/get_bits: actually make cached reader correctly disabled --- libavcodec/golomb.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libavcodec/golomb.h') 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); -- cgit v1.2.3