Commit a903f8f0 authored by Justin Ruggles's avatar Justin Ruggles

Include libavutil/channel_layout.h instead of libavutil/audioconvert.h

Also reorder some other #include when applicable.
parent 5980f5dd
......@@ -32,7 +32,7 @@
#include "libswscale/swscale.h"
#include "libavresample/avresample.h"
#include "libavutil/opt.h"
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/parseutils.h"
#include "libavutil/samplefmt.h"
#include "libavutil/colorspace.h"
......
......@@ -23,8 +23,8 @@
#include "libavfilter/avfilter.h"
#include "libavfilter/avfiltergraph.h"
#include "libavutil/audioconvert.h"
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/pixdesc.h"
#include "libavutil/pixfmt.h"
#include "libavutil/samplefmt.h"
......
......@@ -30,10 +30,10 @@
#include "libavfilter/avfilter.h"
#include "libavfilter/avfiltergraph.h"
#include "libavutil/audioconvert.h"
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/avutil.h"
#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/fifo.h"
#include "libavutil/mathematics.h"
......
......@@ -381,7 +381,7 @@ integer or a string representing a channel layout. The default value
of @var{channel_layout} is 3, which corresponds to CH_LAYOUT_STEREO.
Check the channel_layout_map definition in
@file{libavcodec/audioconvert.c} for the mapping between strings and
@file{libavutil/channel_layout.c} for the mapping between strings and
channel layout values.
Follow some examples:
......
......@@ -30,7 +30,7 @@
#ifndef AVCODEC_AACDECTAB_H
#define AVCODEC_AACDECTAB_H
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "aac.h"
#include <stdint.h>
......
......@@ -20,11 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/channel_layout.h"
#include "parser.h"
#include "ac3_parser.h"
#include "aac_ac3_parser.h"
#include "get_bits.h"
#include "libavutil/audioconvert.h"
#define AC3_HEADER_SIZE 7
......
......@@ -30,9 +30,9 @@
#include <stdint.h>
#include "libavutil/audioconvert.h"
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
#include "libavutil/crc.h"
#include "libavutil/opt.h"
#include "avcodec.h"
......@@ -40,7 +40,6 @@
#include "dsputil.h"
#include "ac3dsp.h"
#include "ac3.h"
#include "audioconvert.h"
#include "fft.h"
#include "ac3enc.h"
#include "eac3enc.h"
......
......@@ -24,7 +24,7 @@
* tables taken directly from the AC-3 spec.
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "ac3tab.h"
......
......@@ -45,7 +45,7 @@
* 32bit samplerate
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "get_bits.h"
#include "bytestream.h"
......
......@@ -43,7 +43,7 @@
#include <string.h>
#include <math.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "dsputil.h"
#include "libavutil/common.h"
......
......@@ -24,7 +24,7 @@
* AMR wideband decoder
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/lfg.h"
......
......@@ -20,12 +20,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "dsputil.h"
#include "bytestream.h"
#include "libavutil/audioconvert.h"
#include "libavutil/avassert.h"
#include "libavutil/opt.h"
/**
* @file
......
......@@ -37,7 +37,7 @@
#endif
#include "libavcodec/avcodec.h"
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/imgutils.h"
#include "libavutil/mathematics.h"
......
......@@ -31,7 +31,7 @@
#include "libavutil/cpu.h"
#include "avcodec.h"
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
struct AVAudioConvert;
typedef struct AVAudioConvert AVAudioConvert;
......
......@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "bytestream.h"
......
......@@ -42,13 +42,13 @@
* available.
*/
#include "libavutil/channel_layout.h"
#include "libavutil/lfg.h"
#include "avcodec.h"
#include "get_bits.h"
#include "dsputil.h"
#include "bytestream.h"
#include "fft.h"
#include "libavutil/audioconvert.h"
#include "sinewin.h"
#include "cookdata.h"
......
......@@ -26,12 +26,12 @@
#include <stddef.h>
#include <stdio.h>
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/float_dsp.h"
#include "libavutil/intmath.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mathematics.h"
#include "libavutil/audioconvert.h"
#include "libavutil/samplefmt.h"
#include "avcodec.h"
#include "dsputil.h"
......
......@@ -24,7 +24,7 @@
* Delphine Software International CIN audio/video decoders
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "bytestream.h"
#include "mathops.h"
......
......@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/crc.h"
#include "libavutil/log.h"
#include "bytestream.h"
......
......@@ -33,7 +33,7 @@
#include <limits.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/crc.h"
#include "avcodec.h"
#include "internal.h"
......
......@@ -34,11 +34,11 @@
* respectively of each byte are ignored.
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "get_bits.h"
#include "g722.h"
#include "libavutil/opt.h"
#define OFFSET(x) offsetof(G722Context, x)
#define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM
......
......@@ -26,7 +26,7 @@
*/
#define BITSTREAM_READER_LE
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "avcodec.h"
......
......@@ -23,8 +23,8 @@
*/
#include <limits.h>
#include "libavutil/audioconvert.h"
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "internal.h"
......
......@@ -24,7 +24,7 @@
* GSM decoder
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "get_bits.h"
#include "msgsmdec.h"
......
......@@ -35,11 +35,11 @@
#include <stddef.h>
#include <stdio.h>
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "get_bits.h"
#include "dsputil.h"
#include "fft.h"
#include "libavutil/audioconvert.h"
#include "sinewin.h"
#include "imcdata.h"
......
......@@ -26,11 +26,11 @@
#include <faac.h>
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "avcodec.h"
#include "audio_frame_queue.h"
#include "internal.h"
#include "libavutil/audioconvert.h"
#include "libavutil/common.h"
/* libfaac has an encoder delay of 1024 samples */
......
......@@ -21,12 +21,12 @@
#include <fdk-aac/aacenc_lib.h>
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "audio_frame_queue.h"
#include "internal.h"
#include "libavutil/audioconvert.h"
#include "libavutil/common.h"
#include "libavutil/opt.h"
typedef struct AACContext {
const AVClass *class;
......
......@@ -29,11 +29,11 @@
#include <gsm/gsm.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "avcodec.h"
#include "internal.h"
#include "gsm.h"
#include "libavutil/common.h"
static av_cold int libgsm_encode_init(AVCodecContext *avctx) {
if (avctx->channels > 1) {
......
......@@ -21,10 +21,10 @@
#include <ilbc.h>
#include "libavutil/audioconvert.h"
#include "avcodec.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "internal.h"
static int get_mode(AVCodecContext *avctx)
......
......@@ -26,7 +26,7 @@
#include <lame/lame.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/log.h"
......
......@@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/audioconvert.h"
#include "avcodec.h"
#include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "audio_frame_queue.h"
#include "internal.h"
......
......@@ -23,7 +23,7 @@
#include <speex/speex_stereo.h>
#include <speex/speex_callbacks.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "avcodec.h"
......
......@@ -85,7 +85,7 @@
#include <speex/speex_header.h>
#include <speex/speex_stereo.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/opt.h"
#include "avcodec.h"
......
......@@ -26,8 +26,8 @@
#include <stdint.h>
#include "libavutil/channel_layout.h"
#include "libavutil/crc.h"
#include "libavutil/audioconvert.h"
#include "get_bits.h"
#include "parser.h"
#include "mlp_parser.h"
......
......@@ -25,12 +25,12 @@
* divided into 32 subbands.
*/
#include "libavutil/channel_layout.h"
#include "libavutil/lfg.h"
#include "avcodec.h"
#include "get_bits.h"
#include "dsputil.h"
#include "mpegaudiodsp.h"
#include "libavutil/audioconvert.h"
#include "mpc.h"
#include "mpc7data.h"
......
......@@ -25,12 +25,12 @@
* divided into 32 subbands.
*/
#include "libavutil/channel_layout.h"
#include "libavutil/lfg.h"
#include "avcodec.h"
#include "get_bits.h"
#include "dsputil.h"
#include "mpegaudiodsp.h"
#include "libavutil/audioconvert.h"
#include "mpc.h"
#include "mpc8data.h"
......
......@@ -24,7 +24,7 @@
* MPEG Audio decoder
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "get_bits.h"
#include "mathops.h"
......
......@@ -24,7 +24,7 @@
* The simplest mpeg audio layer 2 encoder.
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "internal.h"
......
......@@ -31,14 +31,14 @@
* implementors. The original code is available from http://code.google.com/p/nelly2pcm/
*/
#include "nellymoser.h"
#include "libavutil/channel_layout.h"
#include "libavutil/lfg.h"
#include "libavutil/random_seed.h"
#include "libavutil/audioconvert.h"
#include "avcodec.h"
#include "dsputil.h"
#include "fft.h"
#include "fmtconvert.h"
#include "nellymoser.h"
#include "sinewin.h"
#define BITSTREAM_READER_LE
......
......@@ -24,7 +24,7 @@
* PCM codecs for encodings found in MPEG streams (DVD/Blu-ray)
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "bytestream.h"
......
......@@ -29,7 +29,7 @@
#include <stddef.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "internal.h"
#include "get_bits.h"
......
......@@ -36,7 +36,7 @@
#include <stdio.h>
#define BITSTREAM_READER_LE
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "get_bits.h"
#include "dsputil.h"
......
......@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/intmath.h"
#include "avcodec.h"
#include "get_bits.h"
......
......@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "avcodec.h"
#define BITSTREAM_READER_LE
......
......@@ -26,11 +26,11 @@
* Dedicated to the mastermind behind it, Ralph Wiggum.
*/
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "get_bits.h"
#include "golomb.h"
#include "unary.h"
#include "libavutil/audioconvert.h"
#include "ralfdata.h"
#define FILTER_NONE 0
......
......@@ -25,7 +25,7 @@
#include <stdint.h>
#include <string.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/mathematics.h"
#include "avcodec.h"
#define BITSTREAM_READER_LE
......
......@@ -31,8 +31,8 @@
#include <stdio.h>
#include <stdlib.h>
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "libavutil/audioconvert.h"
#include "mathops.h"
#define BITSTREAM_READER_LE
......
......@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "dsputil.h"
......
......@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "avcodec.h"
#include "get_bits.h"
......
......@@ -27,10 +27,10 @@
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
#include "libavutil/crc.h"
#include "libavutil/mathematics.h"
#include "libavutil/pixdesc.h"
#include "libavutil/audioconvert.h"
#include "libavutil/imgutils.h"
#include "libavutil/samplefmt.h"
#include "libavutil/dict.h"
......@@ -38,7 +38,6 @@
#include "dsputil.h"
#include "libavutil/opt.h"
#include "thread.h"
#include "audioconvert.h"
#include "internal.h"
#include "bytestream.h"
#include <stdlib.h>
......
......@@ -43,7 +43,7 @@
#include <stdlib.h>
#include <string.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
......
......@@ -18,10 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/channel_layout.h"
#include "libavutil/mem.h"
#include "dsputil.h"
#include "vorbis.h"
#include "libavutil/audioconvert.h"
#include "libavutil/mem.h"
const uint8_t ff_vorbis_channel_layout_offsets[8][8] = {
{ 0 },
......
......@@ -21,7 +21,7 @@
#define BITSTREAM_READER_LE
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "get_bits.h"
#include "unary.h"
......
......@@ -29,7 +29,7 @@
#include <math.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/mem.h"
#include "dsputil.h"
#include "avcodec.h"
......
......@@ -21,7 +21,7 @@
#include <stdint.h>
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
......
......@@ -31,7 +31,7 @@
#include <alsa/asoundlib.h>
#include "libavformat/avformat.h"
#include "libavutil/avassert.h"
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "alsa-audio.h"
......
......@@ -23,8 +23,8 @@
* format audio filter
*/
#include "libavutil/audioconvert.h"
#include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/opt.h"
......
......@@ -28,10 +28,10 @@
* output.
*/
#include "libavutil/audioconvert.h"
#include "libavutil/audio_fifo.h"
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/float_dsp.h"
#include "libavutil/mathematics.h"
......
......@@ -27,7 +27,7 @@
#include <stddef.h>
#include "libavutil/adler32.h"
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/mem.h"
#include "libavutil/samplefmt.h"
......
......@@ -25,8 +25,8 @@
#include <ctype.h>
#include "libavutil/audioconvert.h"
#include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
......
......@@ -23,7 +23,7 @@
* Split an audio stream into per-channel streams.
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/internal.h"
#include "libavutil/opt.h"
......
......@@ -25,8 +25,8 @@
* a single output
*/
#include "libavutil/audioconvert.h"
#include "libavutil/avassert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/opt.h"
......
......@@ -24,10 +24,10 @@
#include <inttypes.h>
#include <stdio.h>
#include "libavutil/channel_layout.h"
#include "libavutil/internal.h"
#include "avfilter.h"
#include "internal.h"
#include "libavutil/audioconvert.h"
#include "libavutil/internal.h"
typedef struct {
uint64_t channel_layout;
......
......@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/audioconvert.h"
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "audio.h"
......
......@@ -21,10 +21,10 @@
/* #define DEBUG */
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "libavutil/pixdesc.h"
#include "libavutil/rational.h"
#include "libavutil/audioconvert.h"
#include "avfilter.h"
#include "formats.h"
...