Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'

* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
  get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes

The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c

Merged-by: Clément Bœsch <clement@stupeflix.com>

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
 

libavcodec/binkaudio.c

@@ -29,15 +29,16 @@
  */
 
 #include "libavutil/channel_layout.h"
-#include "avcodec.h"
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
-#include "dct.h"
-#include "rdft.h"
-#include "internal.h"
-#include "wma_freqs.h"
 #include "libavutil/intfloat.h"
 
+#define BITSTREAM_READER_LE
+#include "avcodec.h"
+#include "dct.h"
+#include "get_bits.h"
+#include "internal.h"
+#include "rdft.h"
+#include "wma_freqs.h"
+
 static float quant_table[96];
 
 #define MAX_CHANNELS 2

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,

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 {

libavcodec/eatgv.c

@@ -28,13 +28,14 @@
  * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGV
  */
 
-#include "avcodec.h"
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
-#include "internal.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem.h"
 
+#define BITSTREAM_READER_LE
+#include "avcodec.h"
+#include "get_bits.h"
+#include "internal.h"
+
 #define EA_PREAMBLE_SIZE    8
 #define kVGT_TAG MKTAG('k', 'V', 'G', 'T')
 

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

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"
 

libavcodec/g723_1dec.c

@@ -25,17 +25,18 @@
  * 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 "celp_math.h"
-#include "g723_1.h"
+#include "get_bits.h"
 #include "internal.h"
+#include "g723_1.h"
 
 #define CNG_RANDOM_SEED 12345
 

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"

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
 

libavcodec/interplayvideo.c

@@ -39,11 +39,12 @@
 #include <string.h>
 
 #include "libavutil/intreadwrite.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

libavcodec/ivi.c

@@ -28,10 +28,11 @@
 
 #include <inttypes.h>
 
-#define BITSTREAM_READER_LE
 #include "libavutil/attributes.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/timer.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"

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"

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,

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;

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 "qdm2_tablegen.h"
 

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 "get_bits.h"
+#include "avcodec.h"
-#include "ra288.h"
-#include "lpc.h"
 #include "celp_filters.h"
+#include "get_bits.h"
+#include "internal.h"
+#include "lpc.h"
+#include "ra288.h"
 
 #define MAX_BACKWARD_FILTER_ORDER  36
 #define MAX_BACKWARD_FILTER_LEN    40

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"

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

libavcodec/tak.c

@@ -21,6 +21,8 @@
 
 #include "libavutil/crc.h"
 #include "libavutil/intreadwrite.h"
+
+#define BITSTREAM_READER_LE
 #include "tak.h"
 
 static const int64_t tak_channel_layouts[] = {

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

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;

libavcodec/takdec.c

@@ -27,13 +27,15 @@
 
 #include "libavutil/internal.h"
 #include "libavutil/samplefmt.h"
-#include "tak.h"
+
-#include "takdsp.h"
+#define BITSTREAM_READER_LE
 #include "audiodsp.h"
 #include "thread.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "unary.h"
+#include "tak.h"
+#include "takdsp.h"
 
 #define MAX_SUBFRAMES     8                         ///< max number of subframes per channel
 #define MAX_PREDICTORS  256

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"
 

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"

libavcodec/tta.c

@@ -27,8 +27,13 @@
  * @author Alex Beregszaszi
  */
 
-#define BITSTREAM_READER_LE
 #include <limits.h>
+
+#include "libavutil/crc.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/opt.h"
+
+#define BITSTREAM_READER_LE
 #include "ttadata.h"
 #include "ttadsp.h"
 #include "avcodec.h"
@@ -36,9 +41,6 @@
 #include "thread.h"
 #include "unary.h"
 #include "internal.h"
-#include "libavutil/crc.h"
-#include "libavutil/intreadwrite.h"
-#include "libavutil/opt.h"
 
 #define FORMAT_SIMPLE    1
 #define FORMAT_ENCRYPTED 2

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"

libavcodec/vorbis.c

@@ -29,7 +29,6 @@
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
-
 #include "vorbis.h"
 
 

libavcodec/vorbisdec.c

@@ -29,14 +29,14 @@
 #include <inttypes.h>
 #include <math.h>
 
-#define BITSTREAM_READER_LE
-#include "libavutil/float_dsp.h"
 #include "libavutil/avassert.h"
-#include "avcodec.h"
+#include "libavutil/float_dsp.h"
-#include "get_bits.h"
-#include "fft.h"
-#include "internal.h"
 
+#define BITSTREAM_READER_LE
+#include "avcodec.h"
+#include "fft.h"
+#include "get_bits.h"
+#include "internal.h"
 #include "vorbis.h"
 #include "vorbisdsp.h"
 #include "xiph.h"

libavcodec/wavpack.c

@@ -19,15 +19,15 @@
  * 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 "thread.h"
 #include "unary.h"
-#include "bytestream.h"
 #include "wavpack.h"
 
 /**

libavcodec/webp.c

@@ -40,13 +40,14 @@
  *   - XMP metadata
  */
 
-#define BITSTREAM_READER_LE
 #include "libavutil/imgutils.h"
+
+#define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "bytestream.h"
 #include "exif.h"
-#include "internal.h"
 #include "get_bits.h"
+#include "internal.h"
 #include "thread.h"
 #include "vp8.h"
 

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"
 

libavformat/takdec.c

@@ -20,12 +20,15 @@
  */
 
 #include "libavutil/crc.h"
+
+#define BITSTREAM_READER_LE
 #include "libavcodec/tak.h"
+
+#include "apetag.h"
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"
 #include "rawdec.h"
-#include "apetag.h"
 
 typedef struct TAKDemuxContext {
     int     mlast_frame;