diff options
33 files changed, 94 insertions, 74 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index dffcdeeea8..cc55870114 100644 --- 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 5cc23311f5..f1fa2ab882 100644 --- 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 fc1936985d..ea5da610da 100644 --- 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 f8a47cb1a7..a43d688e72 100644 --- 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 882bf077b2..60399c5593 100644 --- 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 9a51bdaa9c..b872b3a53d 100644 --- 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 f4f64d8419..1dd7eedd74 100644 --- 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 6f283b449f..e9896b5e7a 100644 --- a/libavcodec/g723_1dec.c +++ b/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 diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index 17f236761d..a58dfa0910 100644 --- 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 69f78c90b2..594c56d163 100644 --- 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 88c610d651..aa030152f0 100644 --- a/libavcodec/interplayvideo.c +++ b/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 diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index a1eab941d2..70f08a8503 100644 --- a/libavcodec/ivi.c +++ b/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" diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index 5a7f4c3fa1..6a7e31a26b 100644 --- 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 4c4ddb46f5..003bc2c864 100644 --- 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 e6625cb98c..b0deb79cf5 100644 --- 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 074aafdfb2..dd8b257f04 100644 --- 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 "qdm2_tablegen.h" diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index e141bb3eba..f1b3c8eab5 100644 --- 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 595097a6b4..70d460a678 100644 --- 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 f4fc16c42c..b8a0c558a6 100644 --- 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 ed41ca8a2e..d2670e00ff 100644 --- a/libavcodec/tak.c +++ b/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[] = { diff --git a/libavcodec/tak.h b/libavcodec/tak.h index e8e2dacf7c..4fa1239093 100644 --- 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 1417fb4526..835a47bd52 100644 --- 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 023bc878e8..97732813ec 100644 --- a/libavcodec/takdec.c +++ b/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 diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c index df12ee3809..06c5fd6b09 100644 --- 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 69a6facaf2..f64c76507e 100644 --- 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 1e2e9c4ef4..9cb044e991 100644 --- a/libavcodec/tta.c +++ b/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 diff --git a/libavcodec/vble.c b/libavcodec/vble.c index 0340caddef..032d9c2118 100644 --- 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 86d10407f4..a8324248db 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -29,7 +29,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 225f1e9414..0a5eaa6879 100644 --- a/libavcodec/vorbisdec.c +++ b/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 "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 b6022f0fa5..071e2be72c 100644 --- a/libavcodec/wavpack.c +++ b/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" /** diff --git a/libavcodec/webp.c b/libavcodec/webp.c index e715c4b164..45abfdc3ca 100644 --- a/libavcodec/webp.c +++ b/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" diff --git a/libavcodec/xan.c b/libavcodec/xan.c index 9609f83121..4c01c0013f 100644 --- 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 4b4124f9d4..a8fb363b34 100644 --- a/libavformat/takdec.c +++ b/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; |