ffmpeg | branch: master | Clément Bœsch <clem...@stupeflix.com> | Wed Jun 29 11:27:33 2016 +0200| [ae753dbd0de448b51f0e0b980c26b94747ec44f5] | committer: Clément Bœsch
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 <clem...@stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae753dbd0de448b51f0e0b980c26b94747ec44f5 --- libavcodec/bink.c | 6 +++--- libavcodec/binkaudio.c | 9 +++++---- libavcodec/dxtory.c | 5 +++-- libavcodec/eatgq.c | 8 ++++---- libavcodec/eatgv.c | 7 ++++--- libavcodec/escape124.c | 5 ++--- libavcodec/escape130.c | 3 ++- libavcodec/g723_1dec.c | 9 +++++---- libavcodec/indeo2.c | 3 ++- libavcodec/indeo4.c | 4 ++-- libavcodec/interplayvideo.c | 5 +++-- libavcodec/ivi.c | 3 ++- libavcodec/metasound.c | 5 +++-- libavcodec/msgsmdec.c | 3 ++- libavcodec/nellymoserdec.c | 6 +++--- libavcodec/qdm2.c | 7 ++++--- libavcodec/ra288.c | 9 +++++---- libavcodec/sipr.c | 4 ++-- libavcodec/smacker.c | 8 ++++---- libavcodec/tak.c | 2 ++ libavcodec/tak.h | 3 +-- libavcodec/tak_parser.c | 3 ++- libavcodec/takdec.c | 6 ++++-- libavcodec/tiertexseqv.c | 2 +- libavcodec/tscc2.c | 2 +- libavcodec/tta.c | 10 ++++++---- libavcodec/vble.c | 3 +-- libavcodec/vorbis.c | 1 - libavcodec/vorbisdec.c | 8 ++++---- libavcodec/wavpack.c | 6 +++--- libavcodec/webp.c | 5 +++-- libavcodec/xan.c | 3 ++- libavformat/takdec.c | 5 ++++- 33 files changed, 94 insertions(+), 74 deletions(-) diff --git a/libavcodec/bink.c b/libavcodec/bink.c index dffcdee..cc55870 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 5cc2331..f1fa2ab 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 fc19369..ea5da61 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 f8a47cb..a43d688 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 882bf07..60399c5 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 9a51bda..b872b3a 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 f4f64d8..1dd7eed 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 6f283b4..e9896b5 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 17f2367..a58dfa0 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 69f78c9..594c56d 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 88c610d..aa03015 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 a1eab94..70f08a8 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 5a7f4c3..6a7e31a2 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 4c4ddb4..003bc2c 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 e6625cb..b0deb79 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 074aafd..dd8b257 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 e141bb3..f1b3c8e 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 595097a..70d460a 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 f4fc16c..b8a0c55 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 ed41ca8..d2670e0 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 e8e2dac..4fa1239 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 1417fb4..835a47b 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 023bc87..9773281 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 df12ee3..06c5fd6 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 69a6fac..f64c765 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 1e2e9c4..9cb044e 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 0340cad..032d9c2 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 86d1040..a832424 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 225f1e9..0a5eaa6 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 b6022f0..071e2be 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 e715c4b..45abfdc 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 9609f83..4c01c00 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 4b4124f..a8fb363 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; ====================================================================== diff --cc libavcodec/g723_1dec.c index 6f283b4,f50bed1..e9896b5 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@@ -28,14 -28,14 +28,15 @@@ #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 --cc libavcodec/interplayvideo.c index 88c610d,e0d1e91..aa03015 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@@ -38,12 -38,11 +38,13 @@@ #include <stdlib.h> #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 --cc libavcodec/ivi.c index a1eab94,8a59777..70f08a8 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@@ -28,10 -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 --cc libavcodec/qdm2.c index 074aafd,ec57b35..dd8b257 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@@ -40,12 -41,14 +41,12 @@@ #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" - #define QDM2_LIST_ADD(list, size, packet) \ do { \ if (size > 0) { \ diff --cc libavcodec/tak.c index ed41ca8,bd82c3d..d2670e0 --- a/libavcodec/tak.c +++ b/libavcodec/tak.c @@@ -19,32 -19,13 +19,34 @@@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/bswap.h" #include "libavutil/crc.h" #include "libavutil/intreadwrite.h" + + #define BITSTREAM_READER_LE #include "tak.h" +static const int64_t tak_channel_layouts[] = { + 0, + AV_CH_FRONT_LEFT, + AV_CH_FRONT_RIGHT, + AV_CH_FRONT_CENTER, + AV_CH_LOW_FREQUENCY, + AV_CH_BACK_LEFT, + AV_CH_BACK_RIGHT, + AV_CH_FRONT_LEFT_OF_CENTER, + AV_CH_FRONT_RIGHT_OF_CENTER, + AV_CH_BACK_CENTER, + AV_CH_SIDE_LEFT, + AV_CH_SIDE_RIGHT, + AV_CH_TOP_CENTER, + AV_CH_TOP_FRONT_LEFT, + AV_CH_TOP_FRONT_CENTER, + AV_CH_TOP_FRONT_RIGHT, + AV_CH_TOP_BACK_LEFT, + AV_CH_TOP_BACK_CENTER, + AV_CH_TOP_BACK_RIGHT, +}; + static const uint16_t frame_duration_type_quants[] = { 3, 4, 6, 8, 4096, 8192, 16384, 512, 1024, 2048, }; diff --cc libavcodec/takdec.c index 023bc87,c9db928..9773281 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@@ -27,15 -27,15 +27,17 @@@ #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_SUBFRAMES 8 ///< max number of subframes per channel #define MAX_PREDICTORS 256 typedef struct MCDParam { diff --cc libavcodec/tta.c index 1e2e9c4,2b57406..9cb044e --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@@ -27,18 -27,14 +27,20 @@@ * @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" #include "get_bits.h" +#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 --cc libavcodec/vorbisdec.c index 225f1e9,8b800fd..0a5eaa6 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@@ -29,14 -25,13 +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 --cc libavcodec/wavpack.c index b6022f0,7f55f51..071e2be --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@@ -19,16 -19,14 +19,16 @@@ * 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" /** * @file diff --cc libavcodec/webp.c index e715c4b,b26399c..45abfdc --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@@ -37,16 -34,16 +37,17 @@@ * Unimplemented: * - Animation * - ICC profile - * - Exif and XMP metadata + * - 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 --cc libavformat/takdec.c index 4b4124f,b28d44c..a8fb363 --- a/libavformat/takdec.c +++ b/libavformat/takdec.c @@@ -19,13 -19,13 +19,16 @@@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
