27 files changed, 32 insertions, 32 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 2d03c554a6..fa50d6178d 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 b55ea07699..f38c030b7c 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 adffc6b2b6..d73ffcdabc 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 ed4cbc7528..e82ed32470 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 597d0db8da..ccdb35ef2b 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 815cd58a9b..f6d7c8268e 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 8abfde1150..1668600b2d 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 398a9acd92..ecf89cc817 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 ef85e32d87..ed8d83c83b 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 ba1bc18eff..8b72b1f0c2 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 d0e8f4cdc6..db98bec9c5 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 bd3d4e6fd4..9cec0a83a2 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 ff9b275b77..1a288ee291 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 0716c25a20..cbcc4f941b 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 af286fbf87..7f585e4128 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 9341c69281..91c47a8ec2 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 062d9fac94..4cb2493fc9 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 c832b9b1fd..4502fa5f2a 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 ba7da02622..0c7c40560f 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 d48fa15a72..12d5bce4ac 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 c8d58fd9ec..7ec5435a06 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 a13bcf8c5f..fa205f5982 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 8ff24ab627..86df2886f2 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 381b61d060..70690ddb2c 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 3cf5986103..7d16a9b5a6 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 f3e92b75f2..4c4721ada2 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 6211ca450d..58c80c05fa 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"