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)