From 4f28ef1c165a9ca65b3132065ee8db1e72a5f63b Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 23 Feb 2025 23:26:33 +0100 Subject: [PATCH 2/9] avcodec/get_bits: Remove LONG_BITSTREAM_READER No longer used anywhere. Signed-off-by: Andreas Rheinhardt --- libavcodec/get_bits.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index fe2f6378b4..39d8e5bc1e 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -163,11 +163,7 @@ static inline unsigned int show_bits(GetBitContext *s, int n); * For examples see get_bits, show_bits, skip_bits, get_vlc. */ -#if defined LONG_BITSTREAM_READER -# define MIN_CACHE_BITS 32 -#else -# define MIN_CACHE_BITS 25 -#endif +#define MIN_CACHE_BITS 25 #define OPEN_READER_NOSIZE(name, gb) \ unsigned int name ## _index = (gb)->index; \ @@ -195,24 +191,11 @@ static inline unsigned int show_bits(GetBitContext *s, int n); /* Using these two macros ensures that 32 bits are available. */ # define UPDATE_CACHE_LE_32(name, gb) UPDATE_CACHE_LE_EXT(name, (gb), 64, 32) - # define UPDATE_CACHE_BE_32(name, gb) UPDATE_CACHE_BE_EXT(name, (gb), 64, 32) -# ifdef LONG_BITSTREAM_READER - -# define UPDATE_CACHE_LE(name, gb) UPDATE_CACHE_LE_32(name, (gb)) - -# define UPDATE_CACHE_BE(name, gb) UPDATE_CACHE_BE_32(name, (gb)) - -#else - # define UPDATE_CACHE_LE(name, gb) UPDATE_CACHE_LE_EXT(name, (gb), 32, 32) - # define UPDATE_CACHE_BE(name, gb) UPDATE_CACHE_BE_EXT(name, (gb), 32, 32) -#endif - - #ifdef BITSTREAM_READER_LE # define UPDATE_CACHE(name, gb) UPDATE_CACHE_LE(name, gb) -- 2.45.2