diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 2d03c554a68bd65c0baae93b68ce161244dae680..fa50d6178d3272e090c30fb96ccc57e3c385826a 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "dsputil.h"
 #include "get_bits.h"
diff --git a/libavcodec/bink.c b/libavcodec/bink.c
index b55ea076992c6b3306df22d06829419cfe63129b..f38c030b7c05663f8e4a8e6c8d1df4c1fb102462 100644
--- a/libavcodec/bink.c
+++ b/libavcodec/bink.c
@@ -27,7 +27,7 @@
 #include "binkdsp.h"
 #include "mathops.h"
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 
 #define BINK_FLAG_ALPHA 0x00100000
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index adffc6b2b6962aa3c7219de2e832b867ca75a209..d73ffcdabc36cfdcb8941ac0dd3014e514eb4275 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -29,7 +29,7 @@
  */
 
 #include "avcodec.h"
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 #include "dsputil.h"
 #include "dct.h"
diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c
index ed4cbc7528a7f497df4d54a3a09dabccb7a5af73..e82ed3247060acf3472ee4810dab8011764eafa6 100644
--- a/libavcodec/eatgq.c
+++ b/libavcodec/eatgq.c
@@ -29,7 +29,7 @@
  */
 
 #include "avcodec.h"
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 #include "bytestream.h"
 #include "dsputil.h"
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index 597d0db8dad2be65831c2b6496a93eb80ad6be0b..ccdb35ef2bd2221444a15a7b59898feec1b6e7b5 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -29,7 +29,7 @@
  */
 
 #include "avcodec.h"
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 #include "libavutil/lzo.h"
 #include "libavutil/imgutils.h"
diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c
index 815cd58a9b19ac5c42aa54b497c5a9f74dbb7d3f..f6d7c8268eb9442a51d9da96e455319cbe7d795e 100644
--- a/libavcodec/escape124.c
+++ b/libavcodec/escape124.c
@@ -21,7 +21,7 @@
 
 #include "avcodec.h"
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 
 typedef union MacroBlock {
diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h
index 8abfde11501253cf1374ec0da2957ac75015a6d8..1668600b2ddf945128066dd7f7f79acc10f49239 100644
--- a/libavcodec/get_bits.h
+++ b/libavcodec/get_bits.h
@@ -126,7 +126,7 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
 
 #define CLOSE_READER(name, gb) (gb)->index = name##_index
 
-#ifdef ALT_BITSTREAM_READER_LE
+#ifdef BITSTREAM_READER_LE
 
 # ifdef LONG_BITSTREAM_READER
 #   define UPDATE_CACHE(name, gb) name##_cache = \
@@ -166,7 +166,7 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
 
 #define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num)
 
-#ifdef ALT_BITSTREAM_READER_LE
+#ifdef BITSTREAM_READER_LE
 #   define SHOW_UBITS(name, gb, num) zero_extend(name##_cache, num)
 #   define SHOW_SBITS(name, gb, num) sign_extend(name##_cache, num)
 #else
@@ -256,7 +256,7 @@ static inline unsigned int get_bits1(GetBitContext *s)
 {
     unsigned int index = s->index;
     uint8_t result = s->buffer[index>>3];
-#ifdef ALT_BITSTREAM_READER_LE
+#ifdef BITSTREAM_READER_LE
     result >>= index & 7;
     result &= 1;
 #else
@@ -290,7 +290,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n)
     if (n <= MIN_CACHE_BITS)
         return get_bits(s, n);
     else {
-#ifdef ALT_BITSTREAM_READER_LE
+#ifdef BITSTREAM_READER_LE
         int ret = get_bits(s, 16);
         return ret | (get_bits(s, n-16) << 16);
 #else
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index 398a9acd9233e94bd3920470ff011db12cb3eaff..ecf89cc817db8f8df083c0cb6b541696f687193c 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -23,7 +23,7 @@
  * @file
  * Intel Indeo 2 decoder.
  */
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "indeo2data.h"
@@ -166,7 +166,7 @@ static int ir2_decode_frame(AVCodecContext *avctx,
     s->decode_delta = buf[18];
 
     /* decide whether frame uses deltas or not */
-#ifndef ALT_BITSTREAM_READER_LE
+#ifndef BITSTREAM_READER_LE
     for (i = 0; i < buf_size; i++)
         buf[i] = av_reverse[buf[i]];
 #endif
@@ -207,7 +207,7 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx){
 
     ir2_vlc.table = vlc_tables;
     ir2_vlc.table_allocated = 1 << CODE_VLC_BITS;
-#ifdef ALT_BITSTREAM_READER_LE
+#ifdef BITSTREAM_READER_LE
         init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
                  &ir2_codes[0][1], 4, 2,
                  &ir2_codes[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
diff --git a/libavcodec/indeo2data.h b/libavcodec/indeo2data.h
index ef85e32d8719cdafc97a36c304ffacb573b7edf0..ed8d83c83bae0bf2591610a5ca2913c48d26c649 100644
--- a/libavcodec/indeo2data.h
+++ b/libavcodec/indeo2data.h
@@ -26,7 +26,7 @@
 
 #define IR2_CODES 143
 static const uint16_t ir2_codes[IR2_CODES][2] = {
-#ifdef ALT_BITSTREAM_READER_LE
+#ifdef BITSTREAM_READER_LE
 {0x0000,  3}, {0x0004,  3}, {0x0006,  3}, {0x0001,  5},
 {0x0009,  5}, {0x0019,  5}, {0x000D,  5}, {0x001D,  5},
 {0x0023,  6}, {0x0013,  6}, {0x0033,  6}, {0x000B,  6},
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index ba1bc18eff4f996d6a2e002d44e435e495053ad0..8b72b1f0c25cc829b63b2e0bb800a3e1c0d6c2d2 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -27,7 +27,7 @@
  * Known FOURCCs: 'IV50'
  */
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index d0e8f4cdc6d58303ef3e9d5e51226c218ab252c8..db98bec9c515bbf3b9628c30005cf4bf80baea0f 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -41,7 +41,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "dsputil.h"
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 
 #define PALETTE_COUNT 256
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index bd3d4e6fd4e471c50a1de347d8409e7e8997ddcc..9cec0a83a2613ec7b04ae02bf43edb3d0ae882fd 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -26,7 +26,7 @@
  * Indeo5 decoders.
  */
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "ivi_common.h"
diff --git a/libavcodec/msgsmdec.c b/libavcodec/msgsmdec.c
index ff9b275b77bef575c0d19fd03ac1a38e018eec14..1a288ee291a898142590a751a0ac7c07f2c506de 100644
--- a/libavcodec/msgsmdec.c
+++ b/libavcodec/msgsmdec.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "msgsmdec.h"
 #include "gsmdec_template.c"
diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c
index 0716c25a20fb50fb53f7ad0bc8792133f9790f8d..cbcc4f941bc6a2f2cbdc8e9e76f6684c0185fdd6 100644
--- a/libavcodec/nellymoser.c
+++ b/libavcodec/nellymoser.c
@@ -35,7 +35,7 @@
 #include "avcodec.h"
 #include "dsputil.h"
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 
 const float ff_nelly_dequantization_table[127] = {
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index af286fbf8729ea8b33da1857dc4b14dadef07912..7f585e412865d30b3b7040f70c1cd8659c22cc20 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -41,7 +41,7 @@
 #include "fmtconvert.h"
 #include "sinewin.h"
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 
 
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 9341c692818d98eecb7e8a42fa40680031508750..91c47a8ec20b18b6ee29fda09b556500c01fcd06 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -35,7 +35,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index 062d9fac94080b144960f8b3860e27f71228e1e8..4cb2493fc94c10754d7ae71c2a0439977715e044 100644
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -20,7 +20,7 @@
  */
 
 #include "avcodec.h"
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 #include "ra288.h"
 #include "lpc.h"
diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c
index c832b9b1fdeb35215762ee863d27bd65883ca06f..4502fa5f2a39f9c0a532e53d024eb419870aeb3f 100644
--- a/libavcodec/sipr.c
+++ b/libavcodec/sipr.c
@@ -27,7 +27,7 @@
 
 #include "libavutil/mathematics.h"
 #include "avcodec.h"
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 #include "dsputil.h"
 
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index ba7da026221677cb3629fda60187e24f98e106eb..0c7c40560f06a97bb7b2a1b0e1b96a3eecda2668 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -35,7 +35,7 @@
 #include "libavutil/audioconvert.h"
 #include "mathops.h"
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 #include "bytestream.h"
 
diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c
index d48fa15a7293764a222ebc8c16ca0f6fffa2de3f..12d5bce4ac67726845394b0d267184d18e39ea34 100644
--- a/libavcodec/tiertexseqv.c
+++ b/libavcodec/tiertexseqv.c
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 
 
diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index c8d58fd9eca1149423ff994e40231b3459dbab25..7ec5435a06a594c77ba5861bcd157d3aa0431848 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -27,7 +27,7 @@
  * @author Alex Beregszaszi
  */
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 //#define DEBUG
 #include <limits.h>
 #include "avcodec.h"
diff --git a/libavcodec/vble.c b/libavcodec/vble.c
index a13bcf8c5f2fde0d34d2f4cb0548193cb6181538..fa205f5982c063e3b5a524429e533796335106c4 100644
--- a/libavcodec/vble.c
+++ b/libavcodec/vble.c
@@ -24,7 +24,7 @@
  * VBLE Decoder
  */
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 
 #include "avcodec.h"
 #include "dsputil.h"
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index 8ff24ab6277ef8037f02adff35985441bf3e2269..86df2886f20907b52f68d4f556a3a7fb714d4fe4 100644
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -22,7 +22,7 @@
  * @author Denes Balatoni  ( dbalatoni programozo hu )
  */
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 381b61d060daac57970f8b34f85215154d836bac..70690ddb2cdef84b939f1e03922c1e785c4bc22e 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -25,7 +25,7 @@
 #include <inttypes.h>
 #include <math.h>
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "dsputil.h"
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 3cf59861032cfb34ac275304b43f58efa3069af6..7d16a9b5a60b121605ce020d8c983e929ee852cf 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -18,7 +18,7 @@
  * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "unary.h"
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index f3e92b75f290dbde44763bf2f1fa1429461f0278..4c4721ada270ed853c1ba919838231b67b73e2dc 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -35,7 +35,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "bytestream.h"
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 // for av_memcpy_backptr
 #include "libavutil/lzo.h"
diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c
index 6211ca450d6021db5cf217c24b491211c62010d0..58c80c05fa5c0288ae9d79d7f590fd4222d85c3c 100644
--- a/libavcodec/xxan.c
+++ b/libavcodec/xxan.c
@@ -23,7 +23,7 @@
 #include "avcodec.h"
 #include "libavutil/intreadwrite.h"
 #include "bytestream.h"
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 #include "get_bits.h"
 // for av_memcpy_backptr
 #include "libavutil/lzo.h"