get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes

This avoids the danger that get_bits.h might get indirectly #included before
BITSTREAM_READER_LE is defined.

Also sort headers into canonical order where appropriate.

diff --git a/libavcodec/bink.c b/libavcodec/bink.c
index 94d1598eed5a43a806d67eebac4c1502b75e6b99..74336974d023d5e0337a09763ef130ba6b33b7fa 100644 (file)
--- a/libavcodec/bink.c
+++ b/libavcodec/bink.c
@@ -23,17 +23,17 @@
 #include "libavutil/attributes.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "binkdata.h"
 #include "binkdsp.h"
 #include "blockdsp.h"
+#include "get_bits.h"
 #include "hpeldsp.h"
 #include "internal.h"
 #include "mathops.h"
 
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
-
 #define BINK_FLAG_ALPHA 0x00100000
 #define BINK_FLAG_GRAY  0x00020000
 

diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index 71ad344bbfa680f0daf58ae41ee4e016832722b1..2638eb2b04ca4f5b8ea9223d6bac7d6da7817e18 100644 (file)
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -29,14 +29,15 @@
  */
 
 #include "libavutil/channel_layout.h"
-#include "avcodec.h"
+#include "libavutil/intfloat.h"
+
 #define BITSTREAM_READER_LE
-#include "get_bits.h"
+#include "avcodec.h"
 #include "dct.h"
-#include "rdft.h"
+#include "get_bits.h"
 #include "internal.h"
+#include "rdft.h"
 #include "wma_freqs.h"
-#include "libavutil/intfloat.h"
 
 static float quant_table[96];
 

diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c
index 01726b982e42077c43a5a8b5fd8603eb742b1df4..937b96c839e668f0588eaa9e57e051a34577f7ee 100644 (file)
--- a/libavcodec/dxtory.c
+++ b/libavcodec/dxtory.c
@@ -22,14 +22,15 @@
 
 #include <inttypes.h>
 
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "bytestream.h"
 #include "get_bits.h"
 #include "internal.h"
 #include "unary.h"
-#include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
 
 static int dxtory_decode_v1_rgb(AVCodecContext *avctx, AVFrame *pic,
                                 const uint8_t *src, int src_size,

diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c
index a0496a00cb48acdbe8547c41fb97cf5c6a1855da..ff0aa558f57d7008895f4dfa87e671f977a3ffc5 100644 (file)
--- a/libavcodec/eatgq.c
+++ b/libavcodec/eatgq.c
@@ -28,13 +28,13 @@
  * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGQ
  */
 
-#include "avcodec.h"
 #define BITSTREAM_READER_LE
-#include "get_bits.h"
-#include "bytestream.h"
-#include "idctdsp.h"
 #include "aandcttab.h"
+#include "avcodec.h"
+#include "bytestream.h"
 #include "eaidct.h"
+#include "get_bits.h"
+#include "idctdsp.h"
 #include "internal.h"
 
 typedef struct TgqContext {

diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index 4faae50a1824a798d8fce142fa9f660f3fdc36ab..7f40f45618fd5cba03bdc080d7b8133298bfca5d 100644 (file)
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -28,12 +28,13 @@
  * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGV
  */
 
-#include "avcodec.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/mem.h"
+
 #define BITSTREAM_READER_LE
+#include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
-#include "libavutil/imgutils.h"
-#include "libavutil/mem.h"
 
 #define EA_PREAMBLE_SIZE    8
 #define kVGT_TAG MKTAG('k', 'V', 'G', 'T')

diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c
index 629ba5e2d7d6e286cabe0921e4abb1ab7ccd038d..6d1b487d1beea52214c3b8ceec9683068492588f 100644 (file)
--- a/libavcodec/escape124.c
+++ b/libavcodec/escape124.c
@@ -19,11 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "avcodec.h"
-#include "internal.h"
-
 #define BITSTREAM_READER_LE
+#include "avcodec.h"
 #include "get_bits.h"
+#include "internal.h"
 
 typedef union MacroBlock {
     uint16_t pixels[4];

diff --git a/libavcodec/escape130.c b/libavcodec/escape130.c
index e69e42e7f03b7feb20153b3ab0d9cdddf82ee242..bfc1f3f09e64aee33bb627f2fe8f5aae75d5f486 100644 (file)
--- a/libavcodec/escape130.c
+++ b/libavcodec/escape130.c
@@ -21,8 +21,9 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/mem.h"
-#include "avcodec.h"
+
 #define BITSTREAM_READER_LE
+#include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
 

diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c
index 701e034f8af0ba5eac1fe14e1d16680e2b166afe..f50bed134e9465544037cc78a71ff973a1d8c415 100644 (file)
--- a/libavcodec/g723_1dec.c
+++ b/libavcodec/g723_1dec.c
@@ -25,16 +25,17 @@
  * G.723.1 compatible decoder
  */
 
-#define BITSTREAM_READER_LE
 #include "libavutil/channel_layout.h"
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
-#include "avcodec.h"
-#include "get_bits.h"
+
+#define BITSTREAM_READER_LE
 #include "acelp_vectors.h"
+#include "avcodec.h"
 #include "celp_filters.h"
-#include "g723_1.h"
+#include "get_bits.h"
 #include "internal.h"
+#include "g723_1.h"
 
 #define CNG_RANDOM_SEED 12345
 

diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index e66742018bc77126fe159675823c42a5190c9c7e..3154e2314c42255029ff0773d03dc52f2eed488f 100644 (file)
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -24,8 +24,9 @@
  * Intel Indeo 2 decoder.
  */
 
-#define BITSTREAM_READER_LE
 #include "libavutil/attributes.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "indeo2data.h"

diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c
index 217311f3f821913bd545986be7f7e88358036533..ab42e7bca9ed904c795e30f1f92b87485418e132 100644 (file)
--- a/libavcodec/indeo4.c
+++ b/libavcodec/indeo4.c
@@ -30,10 +30,10 @@
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
-#include "ivi.h"
-#include "ivi_dsp.h"
 #include "indeo4data.h"
 #include "internal.h"
+#include "ivi.h"
+#include "ivi_dsp.h"
 
 #define IVI4_PIC_SIZE_ESC   7
 

diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index e41fc3457929b0372d79ac77523c1f3fd8a14cc3..e0d1e91992fe25717f967a77c2e4b16450b27c90 100644 (file)
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -38,11 +38,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "bytestream.h"
-#include "hpeldsp.h"
-#define BITSTREAM_READER_LE
 #include "get_bits.h"
+#include "hpeldsp.h"
 #include "internal.h"
 
 #define PALETTE_COUNT 256

diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c
index caa3fe6c8ae3d6f8f0f51a04885821dab13f98a2..8a5977705a6abc7a590994b95355a70a65e8b759 100644 (file)
--- a/libavcodec/ivi.c
+++ b/libavcodec/ivi.c
@@ -28,9 +28,10 @@
 
 #include <inttypes.h>
 
-#define BITSTREAM_READER_LE
 #include "libavutil/attributes.h"
 #include "libavutil/timer.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"

diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c
index dbb2a63e3ec48972fc2618c2ccc9844e9d171973..a3b210e7446b08bc8f855806a37ec3849564cd5d 100644 (file)
--- a/libavcodec/metasound.c
+++ b/libavcodec/metasound.c
@@ -25,12 +25,13 @@
 #include <math.h>
 #include <stdint.h>
 
-#define BITSTREAM_READER_LE
 #include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "get_bits.h"
 #include "fft.h"
+#include "get_bits.h"
 #include "internal.h"
 #include "lsp.h"
 #include "sinewin.h"

diff --git a/libavcodec/msgsmdec.c b/libavcodec/msgsmdec.c
index be5062ad91c9e811fb04672db93f3917945ce916..92b5ae6be86a54346ea3dfc8b2831b53429ad82f 100644 (file)
--- a/libavcodec/msgsmdec.c
+++ b/libavcodec/msgsmdec.c
@@ -21,8 +21,9 @@
 
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "msgsmdec.h"
 #include "gsm.h"
+#include "msgsmdec.h"
+
 #include "gsmdec_template.c"
 
 int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples,

diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index 5033282061e21b6827c6e071262e63adf20bde6c..355935f97c371bc1eb9ea127606d69898e7c6df7 100644 (file)
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -35,15 +35,15 @@
 #include "libavutil/float_dsp.h"
 #include "libavutil/lfg.h"
 #include "libavutil/random_seed.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "fft.h"
+#include "get_bits.h"
 #include "internal.h"
 #include "nellymoser.h"
 #include "sinewin.h"
 
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
-
 
 typedef struct NellyMoserDecodeContext {
     AVCodecContext* avctx;

diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index b33e7c64c3899fb74c8f957e53ac7342ddfc4e9e..ec57b359ca38ec4383fcc248972af46d3310d9b8 100644 (file)
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -35,14 +35,15 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#define BITSTREAM_READER_LE
 #include "libavutil/channel_layout.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
-#include "rdft.h"
-#include "mpegaudiodsp.h"
 #include "mpegaudio.h"
+#include "mpegaudiodsp.h"
+#include "rdft.h"
 
 #include "qdm2data.h"
 #include "qdm2_tablegen.h"

diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index a9f1045301b4107efec42afceda45aac8363da97..96d8d1ece171c3ab2a027d6719672402785675bd 100644 (file)
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -22,13 +22,14 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/internal.h"
-#include "avcodec.h"
-#include "internal.h"
+
 #define BITSTREAM_READER_LE
+#include "avcodec.h"
+#include "celp_filters.h"
 #include "get_bits.h"
-#include "ra288.h"
+#include "internal.h"
 #include "lpc.h"
-#include "celp_filters.h"
+#include "ra288.h"
 
 #define MAX_BACKWARD_FILTER_ORDER  36
 #define MAX_BACKWARD_FILTER_LEN    40

diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c
index 3f17686a2a9444ef4c487dda23f0918a279f5a37..686b3e2154af2982cfbd28baf3c19aaf78b01fe4 100644 (file)
--- a/libavcodec/sipr.c
+++ b/libavcodec/sipr.c
@@ -28,11 +28,11 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/mathematics.h"
-#include "avcodec.h"
+
 #define BITSTREAM_READER_LE
+#include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
-
 #include "lsp.h"
 #include "acelp_vectors.h"
 #include "acelp_pitch_delay.h"

diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index 1ec957ad1b11edb22ee0892305561ea92a0cdad7..e3e54752a747cb038da4f369d8cc5ad635573f21 100644 (file)
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -32,13 +32,13 @@
 #include <stdlib.h>
 
 #include "libavutil/channel_layout.h"
-#include "avcodec.h"
-#include "internal.h"
-#include "mathops.h"
 
 #define BITSTREAM_READER_LE
-#include "get_bits.h"
+#include "avcodec.h"
 #include "bytestream.h"
+#include "get_bits.h"
+#include "internal.h"
+#include "mathops.h"
 
 #define SMKTREE_BITS 9
 #define SMK_NODE 0x80000000

diff --git a/libavcodec/tak.c b/libavcodec/tak.c
index 867a84bc7142a5ccb77310fdb76519343672b5e3..bd82c3d1939e8a94d869f45f70a50eacb8f4a302 100644 (file)
--- a/libavcodec/tak.c
+++ b/libavcodec/tak.c
@@ -22,6 +22,8 @@
 #include "libavutil/bswap.h"
 #include "libavutil/crc.h"
 #include "libavutil/intreadwrite.h"
+
+#define BITSTREAM_READER_LE
 #include "tak.h"
 
 static const uint16_t frame_duration_type_quants[] = {

diff --git a/libavcodec/tak.h b/libavcodec/tak.h
index fa91149793455ac49259e35f25e5759a73e976b6..19b1c47521b659b286fef30ea145bb00c4472180 100644 (file)
--- a/libavcodec/tak.h
+++ b/libavcodec/tak.h
@@ -29,9 +29,8 @@
 
 #include <stdint.h>
 
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
 #include "avcodec.h"
+#include "get_bits.h"
 
 #define TAK_FORMAT_DATA_TYPE_BITS               3
 #define TAK_FORMAT_SAMPLE_RATE_BITS            18

diff --git a/libavcodec/tak_parser.c b/libavcodec/tak_parser.c
index 295df2418a6ae077d5ffaea07bc5b6e9d5685022..9ac1deb9f70a3ddf5e0ecb03c2c425105ca2ac53 100644 (file)
--- a/libavcodec/tak_parser.c
+++ b/libavcodec/tak_parser.c
@@ -24,8 +24,9 @@
  * TAK parser
  **/
 
-#include "tak.h"
+#define BITSTREAM_READER_LE
 #include "parser.h"
+#include "tak.h"
 
 typedef struct TAKParseContext {
     ParseContext  pc;

diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
index 93098be7e4ed68d111810daf4709c2ae732ffcb4..c9db928c5c0a0f462376b34db2e71b9176c4c666 100644 (file)
--- a/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@ -27,11 +27,13 @@
 
 #include "libavutil/internal.h"
 #include "libavutil/samplefmt.h"
-#include "tak.h"
+
+#define BITSTREAM_READER_LE
 #include "audiodsp.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "unary.h"
+#include "tak.h"
 
 #define MAX_SUBFRAMES     8                         // max number of subframes per channel
 #define MAX_PREDICTORS  256

diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c
index 626324a170a1360b8abf31b4c8ad2836004b250d..8ca7edfeac99f10f67af38bdf831c4397c5d5e64 100644 (file)
--- a/libavcodec/tiertexseqv.c
+++ b/libavcodec/tiertexseqv.c
@@ -24,8 +24,8 @@
  * Tiertex Limited SEQ video decoder
  */
 
-#include "avcodec.h"
 #define BITSTREAM_READER_LE
+#include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
 

diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c
index e830bf93d53ee76523595de25d834f0a93a94c51..d3d45e4d226a80b20b32c159396a1b7e94b9afb6 100644 (file)
--- a/libavcodec/tscc2.c
+++ b/libavcodec/tscc2.c
@@ -28,8 +28,8 @@
 
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "get_bits.h"
 #include "bytestream.h"
+#include "get_bits.h"
 #include "internal.h"
 #include "mathops.h"
 #include "tscc2data.h"

diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 7399827f2ff550829efcd3541f93a52f392db0d6..2b57406686bcf13f0c00a2dcabe000357d1d56ea 100644 (file)
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -27,12 +27,14 @@
  * @author Alex Beregszaszi
  */
 
-#define BITSTREAM_READER_LE
 #include <limits.h>
+
+#include "libavutil/crc.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
-#include "libavutil/crc.h"
 
 #define FORMAT_SIMPLE    1
 #define FORMAT_ENCRYPTED 2

diff --git a/libavcodec/vble.c b/libavcodec/vble.c
index 7ce1aeebfaab12e4e6e222a0d0c63fd45ee92355..1a7803673122788cb888e225b0c53bbc68109bfd 100644 (file)
--- a/libavcodec/vble.c
+++ b/libavcodec/vble.c
@@ -24,10 +24,9 @@
  * VBLE Decoder
  */
 
-#define BITSTREAM_READER_LE
-
 #include "libavutil/imgutils.h"
 
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "huffyuvdsp.h"

diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index 66fa21b9e19dc3d881f0ee7a5dcb6bdd90eb2cf4..d29769ceadb257de10d7a300f99ecfd4eb827079 100644 (file)
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -25,7 +25,6 @@
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
-
 #include "vorbis.h"
 
 

diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index abc01c8617324b3fc5b5655aaf39a440d06698c3..8b800fd4398260f2e347fa1abb43f71bfd5c5e2f 100644 (file)
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -25,13 +25,13 @@
 #include <inttypes.h>
 #include <math.h>
 
-#define BITSTREAM_READER_LE
 #include "libavutil/float_dsp.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "get_bits.h"
 #include "fft.h"
+#include "get_bits.h"
 #include "internal.h"
-
 #include "vorbis.h"
 #include "vorbisdsp.h"
 #include "xiph.h"

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index ab9dec98598634318eed6ca4b120aa36ab3be7c5..7f55f515a3adf26cd93ed0f0fabea02c452a67da 100644 (file)
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -19,14 +19,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define BITSTREAM_READER_LE
-
 #include "libavutil/channel_layout.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
+#include "bytestream.h"
 #include "get_bits.h"
 #include "internal.h"
 #include "unary.h"
-#include "bytestream.h"
 
 /**
  * @file

diff --git a/libavcodec/webp.c b/libavcodec/webp.c
index c4757446d34eb2019d61f2b447f69151f87dd6be..b26399c504904913daecfc07d22bd698e5068ac7 100644 (file)
--- a/libavcodec/webp.c
+++ b/libavcodec/webp.c
@@ -37,12 +37,13 @@
  *   - Exif and XMP metadata
  */
 
-#define BITSTREAM_READER_LE
 #include "libavutil/imgutils.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "bytestream.h"
-#include "internal.h"
 #include "get_bits.h"
+#include "internal.h"
 #include "thread.h"
 #include "vp8.h"
 

diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index a46b58c7f19fa6645b0ff529e74e9d47193fa633..c16c651d7bcc046ec3f7cd59a827008664624158 100644 (file)
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -34,9 +34,10 @@
 
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "bytestream.h"
-#define BITSTREAM_READER_LE
 #include "get_bits.h"
 #include "internal.h"
 

diff --git a/libavformat/takdec.c b/libavformat/takdec.c
index 61ead31f9e3884b6140d9f3f8e2178773734b3f8..b28d44ce007a8ad8d06b19f26a0c5695dee7df8a 100644 (file)
--- a/libavformat/takdec.c
+++ b/libavformat/takdec.c
@@ -19,11 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define BITSTREAM_READER_LE
 #include "libavcodec/tak.h"
+
+#include "apetag.h"
 #include "avformat.h"
 #include "internal.h"
 #include "rawdec.h"
-#include "apetag.h"
 
 typedef struct TAKDemuxContext {
     int     mlast_frame;