Commit b6686629 authored by Diego Biurrun's avatar Diego Biurrun

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.
parent 09c4e5c5
...@@ -23,17 +23,17 @@ ...@@ -23,17 +23,17 @@
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "binkdata.h" #include "binkdata.h"
#include "binkdsp.h" #include "binkdsp.h"
#include "blockdsp.h" #include "blockdsp.h"
#include "get_bits.h"
#include "hpeldsp.h" #include "hpeldsp.h"
#include "internal.h" #include "internal.h"
#include "mathops.h" #include "mathops.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
#define BINK_FLAG_ALPHA 0x00100000 #define BINK_FLAG_ALPHA 0x00100000
#define BINK_FLAG_GRAY 0x00020000 #define BINK_FLAG_GRAY 0x00020000
......
...@@ -29,14 +29,15 @@ ...@@ -29,14 +29,15 @@
*/ */
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "avcodec.h" #include "libavutil/intfloat.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "get_bits.h" #include "avcodec.h"
#include "dct.h" #include "dct.h"
#include "rdft.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "rdft.h"
#include "wma_freqs.h" #include "wma_freqs.h"
#include "libavutil/intfloat.h"
static float quant_table[96]; static float quant_table[96];
......
...@@ -22,14 +22,15 @@ ...@@ -22,14 +22,15 @@
#include <inttypes.h> #include <inttypes.h>
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "unary.h" #include "unary.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
static int dxtory_decode_v1_rgb(AVCodecContext *avctx, AVFrame *pic, static int dxtory_decode_v1_rgb(AVCodecContext *avctx, AVFrame *pic,
const uint8_t *src, int src_size, const uint8_t *src, int src_size,
......
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGQ * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGQ
*/ */
#include "avcodec.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "get_bits.h"
#include "bytestream.h"
#include "idctdsp.h"
#include "aandcttab.h" #include "aandcttab.h"
#include "avcodec.h"
#include "bytestream.h"
#include "eaidct.h" #include "eaidct.h"
#include "get_bits.h"
#include "idctdsp.h"
#include "internal.h" #include "internal.h"
typedef struct TgqContext { typedef struct TgqContext {
......
...@@ -28,12 +28,13 @@ ...@@ -28,12 +28,13 @@
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGV * 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 #define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "libavutil/imgutils.h"
#include "libavutil/mem.h"
#define EA_PREAMBLE_SIZE 8 #define EA_PREAMBLE_SIZE 8
#define kVGT_TAG MKTAG('k', 'V', 'G', 'T') #define kVGT_TAG MKTAG('k', 'V', 'G', 'T')
......
...@@ -19,11 +19,10 @@ ...@@ -19,11 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "avcodec.h"
#include "internal.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h"
typedef union MacroBlock { typedef union MacroBlock {
uint16_t pixels[4]; uint16_t pixels[4];
......
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "avcodec.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
......
...@@ -25,16 +25,17 @@ ...@@ -25,16 +25,17 @@
* G.723.1 compatible decoder * G.723.1 compatible decoder
*/ */
#define BITSTREAM_READER_LE
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h"
#include "get_bits.h" #define BITSTREAM_READER_LE
#include "acelp_vectors.h" #include "acelp_vectors.h"
#include "avcodec.h"
#include "celp_filters.h" #include "celp_filters.h"
#include "g723_1.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "g723_1.h"
#define CNG_RANDOM_SEED 12345 #define CNG_RANDOM_SEED 12345
......
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
* Intel Indeo 2 decoder. * Intel Indeo 2 decoder.
*/ */
#define BITSTREAM_READER_LE
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "indeo2data.h" #include "indeo2data.h"
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "ivi.h"
#include "ivi_dsp.h"
#include "indeo4data.h" #include "indeo4data.h"
#include "internal.h" #include "internal.h"
#include "ivi.h"
#include "ivi_dsp.h"
#define IVI4_PIC_SIZE_ESC 7 #define IVI4_PIC_SIZE_ESC 7
......
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "hpeldsp.h"
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
#include "hpeldsp.h"
#include "internal.h" #include "internal.h"
#define PALETTE_COUNT 256 #define PALETTE_COUNT 256
......
...@@ -28,9 +28,10 @@ ...@@ -28,9 +28,10 @@
#include <inttypes.h> #include <inttypes.h>
#define BITSTREAM_READER_LE
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/timer.h" #include "libavutil/timer.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
......
...@@ -25,12 +25,13 @@ ...@@ -25,12 +25,13 @@
#include <math.h> #include <math.h>
#include <stdint.h> #include <stdint.h>
#define BITSTREAM_READER_LE
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h"
#include "fft.h" #include "fft.h"
#include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "lsp.h" #include "lsp.h"
#include "sinewin.h" #include "sinewin.h"
......
...@@ -21,8 +21,9 @@ ...@@ -21,8 +21,9 @@
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "msgsmdec.h"
#include "gsm.h" #include "gsm.h"
#include "msgsmdec.h"
#include "gsmdec_template.c" #include "gsmdec_template.c"
int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples, int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples,
......
...@@ -35,15 +35,15 @@ ...@@ -35,15 +35,15 @@
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
#include "libavutil/random_seed.h" #include "libavutil/random_seed.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "fft.h" #include "fft.h"
#include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "nellymoser.h" #include "nellymoser.h"
#include "sinewin.h" #include "sinewin.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
typedef struct NellyMoserDecodeContext { typedef struct NellyMoserDecodeContext {
AVCodecContext* avctx; AVCodecContext* avctx;
......
...@@ -35,14 +35,15 @@ ...@@ -35,14 +35,15 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#define BITSTREAM_READER_LE
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "rdft.h"
#include "mpegaudiodsp.h"
#include "mpegaudio.h" #include "mpegaudio.h"
#include "mpegaudiodsp.h"
#include "rdft.h"
#include "qdm2data.h" #include "qdm2data.h"
#include "qdm2_tablegen.h" #include "qdm2_tablegen.h"
......
...@@ -22,13 +22,14 @@ ...@@ -22,13 +22,14 @@
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "avcodec.h"
#include "internal.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h"
#include "celp_filters.h"
#include "get_bits.h" #include "get_bits.h"
#include "ra288.h" #include "internal.h"
#include "lpc.h" #include "lpc.h"
#include "celp_filters.h" #include "ra288.h"
#define MAX_BACKWARD_FILTER_ORDER 36 #define MAX_BACKWARD_FILTER_ORDER 36
#define MAX_BACKWARD_FILTER_LEN 40 #define MAX_BACKWARD_FILTER_LEN 40
......
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "avcodec.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "lsp.h" #include "lsp.h"
#include "acelp_vectors.h" #include "acelp_vectors.h"
#include "acelp_pitch_delay.h" #include "acelp_pitch_delay.h"
......
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "internal.h"
#include "mathops.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "get_bits.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "get_bits.h"
#include "internal.h"
#include "mathops.h"
#define SMKTREE_BITS 9 #define SMKTREE_BITS 9
#define SMK_NODE 0x80000000 #define SMK_NODE 0x80000000
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#define BITSTREAM_READER_LE
#include "tak.h" #include "tak.h"
static const uint16_t frame_duration_type_quants[] = { static const uint16_t frame_duration_type_quants[] = {
......
...@@ -29,9 +29,8 @@ ...@@ -29,9 +29,8 @@
#include <stdint.h> #include <stdint.h>
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h"
#define TAK_FORMAT_DATA_TYPE_BITS 3 #define TAK_FORMAT_DATA_TYPE_BITS 3
#define TAK_FORMAT_SAMPLE_RATE_BITS 18 #define TAK_FORMAT_SAMPLE_RATE_BITS 18
......
...@@ -24,8 +24,9 @@ ...@@ -24,8 +24,9 @@
* TAK parser * TAK parser
**/ **/
#include "tak.h" #define BITSTREAM_READER_LE
#include "parser.h" #include "parser.h"
#include "tak.h"
typedef struct TAKParseContext { typedef struct TAKParseContext {
ParseContext pc; ParseContext pc;
......
...@@ -27,11 +27,13 @@ ...@@ -27,11 +27,13 @@
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/samplefmt.h" #include "libavutil/samplefmt.h"
#include "tak.h"
#define BITSTREAM_READER_LE
#include "audiodsp.h" #include "audiodsp.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#include "unary.h" #include "unary.h"
#include "tak.h"
#define MAX_SUBFRAMES 8 // max number of subframes per channel #define MAX_SUBFRAMES 8 // max number of subframes per channel
#define MAX_PREDICTORS 256 #define MAX_PREDICTORS 256
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
* Tiertex Limited SEQ video decoder * Tiertex Limited SEQ video decoder
*/ */
#include "avcodec.h"
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h"
#include "bytestream.h" #include "bytestream.h"
#include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "mathops.h" #include "mathops.h"
#include "tscc2data.h" #include "tscc2data.h"
......
...@@ -27,12 +27,14 @@ ...@@ -27,12 +27,14 @@
* @author Alex Beregszaszi * @author Alex Beregszaszi
*/ */
#define BITSTREAM_READER_LE
#include <limits.h> #include <limits.h>
#include "libavutil/crc.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "libavutil/crc.h"
#define FORMAT_SIMPLE 1 #define FORMAT_SIMPLE 1
#define FORMAT_ENCRYPTED 2 #define FORMAT_ENCRYPTED 2
......
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
* VBLE Decoder * VBLE Decoder
*/ */
#define BITSTREAM_READER_LE
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "huffyuvdsp.h" #include "huffyuvdsp.h"
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#define BITSTREAM_READER_LE #define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "vorbis.h" #include "vorbis.h"
......
...@@ -25,13 +25,13 @@ ...@@ -25,13 +25,13 @@
#include <inttypes.h> #include <inttypes.h>
#include <math.h> #include <math.h>
#define BITSTREAM_READER_LE
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h"
#include "fft.h" #include "fft.h"
#include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "vorbis.h" #include "vorbis.h"
#include "vorbisdsp.h" #include "vorbisdsp.h"
#include "xiph.h" #include "xiph.h"
......
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#define BITSTREAM_READER_LE
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "unary.h" #include "unary.h"
#include "bytestream.h"
/** /**
* @file * @file
......
...@@ -37,12 +37,13 @@ ...@@ -37,12 +37,13 @@
* - Exif and XMP metadata * - Exif and XMP metadata
*/ */
#define BITSTREAM_READER_LE
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "internal.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h"
#include "thread.h" #include "thread.h"
#include "vp8.h" #include "vp8.h"
......
...@@ -34,9 +34,10 @@ ...@@ -34,9 +34,10 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
......
...@@ -19,11 +19,13 @@ ...@@ -19,11 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#define BITSTREAM_READER_LE
#include "libavcodec/tak.h" #include "libavcodec/tak.h"
#include "apetag.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "rawdec.h" #include "rawdec.h"
#include "apetag.h"
typedef struct TAKDemuxContext { typedef struct TAKDemuxContext {
int mlast_frame; int mlast_frame;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment