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.
9 years ago · b668662939
parent 09c4e5c598
commit b668662939
33 changed files with 88 additions and 70 deletions
--- 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

--- 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];

--- 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,
--- 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 {
--- 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')
--- 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];
--- 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"

--- 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

--- 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"
--- 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

--- 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
--- 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"
--- 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"
--- 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,
--- 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;
--- 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"
--- 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
--- 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"
--- 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
--- 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[] = {
--- 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
--- 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;
--- 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
--- 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"

--- 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"
--- 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
--- 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"
--- 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"


--- 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"
--- 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
--- 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"

--- 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"

--- 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;