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.
33 files changed:
#include "libavutil/attributes.h"
#include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#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 "avcodec.h"
#include "binkdata.h"
#include "binkdsp.h"
#include "blockdsp.h"
#include "hpeldsp.h"
#include "internal.h"
#include "mathops.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
#define BINK_FLAG_ALPHA 0x00100000
#define BINK_FLAG_GRAY 0x00020000
*/
#include "libavutil/channel_layout.h"
*/
#include "libavutil/channel_layout.h"
+#include "libavutil/intfloat.h"
+
#define BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
-#include "libavutil/intfloat.h"
static float quant_table[96];
static float quant_table[96];
+#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"
#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,
static int dxtory_decode_v1_rgb(AVCodecContext *avctx, AVFrame *pic,
const uint8_t *src, int src_size,
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGQ
*/
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGQ
*/
#define BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
-#include "get_bits.h"
-#include "bytestream.h"
-#include "idctdsp.h"
+#include "avcodec.h"
+#include "bytestream.h"
+#include "get_bits.h"
+#include "idctdsp.h"
#include "internal.h"
typedef struct TgqContext {
#include "internal.h"
typedef struct TgqContext {
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGV
*/
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGV
*/
+#include "libavutil/imgutils.h"
+#include "libavutil/mem.h"
+
#define BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "internal.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')
#define EA_PREAMBLE_SIZE 8
#define kVGT_TAG MKTAG('k', 'V', 'G', 'T')
* 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
typedef union MacroBlock {
uint16_t pixels[4];
typedef union MacroBlock {
uint16_t pixels[4];
#include "libavutil/attributes.h"
#include "libavutil/mem.h"
#include "libavutil/attributes.h"
#include "libavutil/mem.h"
#define BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "internal.h"
#include "get_bits.h"
#include "internal.h"
* G.723.1 compatible decoder
*/
* G.723.1 compatible decoder
*/
-#define BITSTREAM_READER_LE
#include "libavutil/channel_layout.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#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 "acelp_vectors.h"
#include "celp_filters.h"
#include "celp_filters.h"
#define CNG_RANDOM_SEED 12345
#define CNG_RANDOM_SEED 12345
* 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 "get_bits.h"
#include "indeo2data.h"
#include "avcodec.h"
#include "get_bits.h"
#include "indeo2data.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#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 "indeo4data.h"
#include "internal.h"
+#include "ivi.h"
+#include "ivi_dsp.h"
#define IVI4_PIC_SIZE_ESC 7
#define IVI4_PIC_SIZE_ESC 7
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
+#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "bytestream.h"
#include "avcodec.h"
#include "bytestream.h"
-#include "hpeldsp.h"
-#define BITSTREAM_READER_LE
#include "internal.h"
#define PALETTE_COUNT 256
#include "internal.h"
#define PALETTE_COUNT 256
-#define BITSTREAM_READER_LE
#include "libavutil/attributes.h"
#include "libavutil/timer.h"
#include "libavutil/attributes.h"
#include "libavutil/timer.h"
+
+#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
#include <math.h>
#include <stdint.h>
#include <math.h>
#include <stdint.h>
-#define BITSTREAM_READER_LE
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
+
+#define BITSTREAM_READER_LE
#include "internal.h"
#include "lsp.h"
#include "sinewin.h"
#include "internal.h"
#include "lsp.h"
#include "sinewin.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "gsmdec_template.c"
int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples,
#include "gsmdec_template.c"
int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples,
#include "libavutil/float_dsp.h"
#include "libavutil/lfg.h"
#include "libavutil/random_seed.h"
#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 "avcodec.h"
#include "fft.h"
#include "internal.h"
#include "nellymoser.h"
#include "sinewin.h"
#include "internal.h"
#include "nellymoser.h"
#include "sinewin.h"
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
-
typedef struct NellyMoserDecodeContext {
AVCodecContext* avctx;
typedef struct NellyMoserDecodeContext {
AVCodecContext* avctx;
#include <stddef.h>
#include <stdio.h>
#include <stddef.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 "get_bits.h"
#include "internal.h"
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
-#include "rdft.h"
-#include "mpegaudiodsp.h"
+#include "mpegaudiodsp.h"
+#include "rdft.h"
#include "qdm2data.h"
#include "qdm2_tablegen.h"
#include "qdm2data.h"
#include "qdm2_tablegen.h"
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "libavutil/internal.h"
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.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 "celp_filters.h"
#define MAX_BACKWARD_FILTER_ORDER 36
#define MAX_BACKWARD_FILTER_LEN 40
#define MAX_BACKWARD_FILTER_ORDER 36
#define MAX_BACKWARD_FILTER_LEN 40
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "libavutil/mathematics.h"
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "libavutil/mathematics.h"
#define BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "internal.h"
#include "get_bits.h"
#include "internal.h"
#include "lsp.h"
#include "acelp_vectors.h"
#include "acelp_pitch_delay.h"
#include "lsp.h"
#include "acelp_vectors.h"
#include "acelp_pitch_delay.h"
#include <stdlib.h>
#include "libavutil/channel_layout.h"
#include <stdlib.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 "internal.h"
+#include "mathops.h"
#define SMKTREE_BITS 9
#define SMK_NODE 0x80000000
#define SMKTREE_BITS 9
#define SMK_NODE 0x80000000
#include "libavutil/bswap.h"
#include "libavutil/crc.h"
#include "libavutil/intreadwrite.h"
#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[] = {
#include "tak.h"
static const uint16_t frame_duration_type_quants[] = {
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
#define TAK_FORMAT_DATA_TYPE_BITS 3
#define TAK_FORMAT_SAMPLE_RATE_BITS 18
#define TAK_FORMAT_DATA_TYPE_BITS 3
#define TAK_FORMAT_SAMPLE_RATE_BITS 18
+#define BITSTREAM_READER_LE
typedef struct TAKParseContext {
ParseContext pc;
typedef struct TAKParseContext {
ParseContext pc;
#include "libavutil/internal.h"
#include "libavutil/samplefmt.h"
#include "libavutil/internal.h"
#include "libavutil/samplefmt.h"
+
+#define BITSTREAM_READER_LE
#include "audiodsp.h"
#include "avcodec.h"
#include "internal.h"
#include "unary.h"
#include "audiodsp.h"
#include "avcodec.h"
#include "internal.h"
#include "unary.h"
#define MAX_SUBFRAMES 8 // max number of subframes per channel
#define MAX_PREDICTORS 256
#define MAX_SUBFRAMES 8 // max number of subframes per channel
#define MAX_PREDICTORS 256
* Tiertex Limited SEQ video decoder
*/
* Tiertex Limited SEQ video decoder
*/
#define BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "internal.h"
#include "get_bits.h"
#include "internal.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "internal.h"
#include "mathops.h"
#include "tscc2data.h"
#include "internal.h"
#include "mathops.h"
#include "tscc2data.h"
* @author Alex Beregszaszi
*/
* @author Alex Beregszaszi
*/
-#define BITSTREAM_READER_LE
+
+#include "libavutil/crc.h"
+
+#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
-#include "libavutil/crc.h"
#define FORMAT_SIMPLE 1
#define FORMAT_ENCRYPTED 2
#define FORMAT_SIMPLE 1
#define FORMAT_ENCRYPTED 2
-#define BITSTREAM_READER_LE
-
#include "libavutil/imgutils.h"
#include "libavutil/imgutils.h"
+#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "huffyuvdsp.h"
#include "avcodec.h"
#include "get_bits.h"
#include "huffyuvdsp.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include <inttypes.h>
#include <math.h>
#include <inttypes.h>
#include <math.h>
-#define BITSTREAM_READER_LE
#include "libavutil/float_dsp.h"
#include "libavutil/float_dsp.h"
+
+#define BITSTREAM_READER_LE
#include "vorbis.h"
#include "vorbisdsp.h"
#include "xiph.h"
#include "vorbis.h"
#include "vorbisdsp.h"
#include "xiph.h"
* 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 "get_bits.h"
#include "internal.h"
#include "unary.h"
#include "get_bits.h"
#include "internal.h"
#include "unary.h"
* - 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 "bytestream.h"
#include "avcodec.h"
#include "bytestream.h"
#include "thread.h"
#include "vp8.h"
#include "thread.h"
#include "vp8.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
+
+#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "bytestream.h"
#include "avcodec.h"
#include "bytestream.h"
-#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "internal.h"
#include "get_bits.h"
#include "internal.h"
* 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 "avformat.h"
#include "internal.h"
#include "rawdec.h"
#include "avformat.h"
#include "internal.h"
#include "rawdec.h"
typedef struct TAKDemuxContext {
int mlast_frame;
typedef struct TAKDemuxContext {
int mlast_frame;