From 1acd2f6ba7bc85d4aab6f0ebdc56c8d21785640e Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 13 Nov 2012 13:16:48 +0000 Subject: [PATCH] Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h Also remove it in once case when it is not needed. Signed-off-by: Paul B Mahol --- doc/filters.texi | 6 +++--- libavcodec/dcaenc.c | 2 +- libavcodec/vima.c | 2 +- libavdevice/lavfi.c | 2 +- libavfilter/af_aconvert.c | 2 +- libavfilter/af_amerge.c | 2 +- libavfilter/af_aresample.c | 2 +- libavfilter/af_asetnsamples.c | 2 +- libavfilter/af_atempo.c | 2 +- libavfilter/af_earwax.c | 2 +- libavfilter/af_pan.c | 2 +- libavfilter/af_silencedetect.c | 2 +- libavfilter/af_volume.c | 2 +- libavfilter/af_volumedetect.c | 2 +- libavfilter/asrc_aevalsrc.c | 2 +- libavfilter/asrc_flite.c | 2 +- libavfilter/avf_concat.c | 2 +- libavfilter/avf_showspectrum.c | 2 +- libavfilter/avf_showwaves.c | 2 +- libavfilter/f_ebur128.c | 2 +- libavfilter/formats.c | 2 +- libavfilter/graphdump.c | 2 +- libavfilter/sink_buffer.c | 2 +- libavfilter/src_buffer.c | 2 +- libswresample/audioconvert.h | 1 - libswresample/rematrix.c | 2 +- libswresample/swresample-test.c | 2 +- libswresample/swresample.c | 2 +- libswresample/swresample_internal.h | 2 +- tools/graph2dot.c | 2 +- 30 files changed, 31 insertions(+), 32 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index e50e55b410..b86b1468f7 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -268,7 +268,7 @@ corresponding numeric value defined in @file{libavutil/samplefmt.h}. Use 'p' suffix for a planar sample format. @var{channel_layout} specifies the channel layout, and can be a string -or the corresponding number value defined in @file{libavutil/audioconvert.h}. +or the corresponding number value defined in @file{libavutil/channel_layout.h}. The special parameter "auto", signifies that the filter will automatically select the output format depending on the output filter. @@ -949,8 +949,8 @@ the enum AVSampleFormat in @file{libavutil/samplefmt.h} @item channel_layout The channel layout of the incoming audio buffers. Either a channel layout name from channel_layout_map in -@file{libavutil/audioconvert.c} or its corresponding integer representation -from the AV_CH_LAYOUT_* macros in @file{libavutil/audioconvert.h} +@file{libavutil/channel_layout.c} or its corresponding integer representation +from the AV_CH_LAYOUT_* macros in @file{libavutil/channel_layout.h} @end table diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index 104fd87cda..7d55bb5ce9 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -21,9 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/avassert.h" -#include "libavutil/audioconvert.h" #include "avcodec.h" #include "get_bits.h" #include "internal.h" diff --git a/libavcodec/vima.c b/libavcodec/vima.c index 648ae55016..35e2a3cdd5 100644 --- a/libavcodec/vima.c +++ b/libavcodec/vima.c @@ -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 "get_bits.h" #include "adpcm_data.h" diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index f4a54148c4..4f1ba582e7 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -28,13 +28,13 @@ #include "float.h" /* DBL_MIN, DBL_MAX */ #include "libavutil/bprint.h" +#include "libavutil/channel_layout.h" #include "libavutil/file.h" #include "libavutil/log.h" #include "libavutil/mem.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" -#include "libavutil/audioconvert.h" #include "libavfilter/avfilter.h" #include "libavfilter/avfiltergraph.h" #include "libavfilter/buffersink.h" diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c index 6dd845259e..84e5e3ca78 100644 --- a/libavfilter/af_aconvert.c +++ b/libavfilter/af_aconvert.c @@ -25,8 +25,8 @@ * sample format and channel layout conversion audio filter */ -#include "libavutil/audioconvert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libswresample/swresample.h" #include "avfilter.h" #include "audio.h" diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 77ea297cd1..fa4f9f108e 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -23,9 +23,9 @@ * Audio merging filter */ -#include "libavutil/audioconvert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libswresample/swresample.h" // only for SWR_CH_MAX #include "avfilter.h" diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index e400e1f0bb..53c5dcd52f 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -24,8 +24,8 @@ * resampling audio filter */ -#include "libavutil/audioconvert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/samplefmt.h" #include "libavutil/avassert.h" diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c index 467af76571..0c075f6193 100644 --- a/libavfilter/af_asetnsamples.c +++ b/libavfilter/af_asetnsamples.c @@ -25,8 +25,8 @@ */ #include "libavutil/audio_fifo.h" -#include "libavutil/audioconvert.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avfilter.h" #include "audio.h" diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c index c2d1fc1573..06c80ac01d 100644 --- a/libavfilter/af_atempo.c +++ b/libavfilter/af_atempo.c @@ -40,9 +40,9 @@ #include #include "libavcodec/avfft.h" -#include "libavutil/audioconvert.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/eval.h" #include "libavutil/opt.h" #include "libavutil/samplefmt.h" diff --git a/libavfilter/af_earwax.c b/libavfilter/af_earwax.c index 2e2cac39e4..6ce4a78f6a 100644 --- a/libavfilter/af_earwax.c +++ b/libavfilter/af_earwax.c @@ -29,7 +29,7 @@ * front of the listener. Adapted from the libsox earwax effect. */ -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "avfilter.h" #include "audio.h" #include "formats.h" diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index 8d1bb5b323..3199efa358 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -28,8 +28,8 @@ */ #include -#include "libavutil/audioconvert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libswresample/swresample.h" #include "audio.h" diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c index c456ac4970..97d1ec7b7e 100644 --- a/libavfilter/af_silencedetect.c +++ b/libavfilter/af_silencedetect.c @@ -23,7 +23,7 @@ * Audio silence detector */ -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/timestamp.h" #include "audio.h" diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c index 1aca7d95ba..9438108c25 100644 --- a/libavfilter/af_volume.c +++ b/libavfilter/af_volume.c @@ -24,7 +24,7 @@ * based on ffmpeg.c code */ -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "libavutil/eval.h" #include "audio.h" #include "avfilter.h" diff --git a/libavfilter/af_volumedetect.c b/libavfilter/af_volumedetect.c index 0ec69604b7..ab77a9cbef 100644 --- a/libavfilter/af_volumedetect.c +++ b/libavfilter/af_volumedetect.c @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "libavutil/avassert.h" #include "audio.h" #include "avfilter.h" diff --git a/libavfilter/asrc_aevalsrc.c b/libavfilter/asrc_aevalsrc.c index c8b5e02700..9baf3e2ecc 100644 --- a/libavfilter/asrc_aevalsrc.c +++ b/libavfilter/asrc_aevalsrc.c @@ -23,9 +23,9 @@ * eval audio source */ -#include "libavutil/audioconvert.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/eval.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" diff --git a/libavfilter/asrc_flite.c b/libavfilter/asrc_flite.c index 6f8cc9583a..24bccd6540 100644 --- a/libavfilter/asrc_flite.c +++ b/libavfilter/asrc_flite.c @@ -24,7 +24,7 @@ */ #include -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "libavutil/file.h" #include "libavutil/opt.h" #include "avfilter.h" diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index f13e8d0120..8812c9ebb2 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -23,8 +23,8 @@ * concat audio-video filter */ -#include "libavutil/audioconvert.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avfilter.h" #define FF_BUFQUEUE_SIZE 256 diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c index 4ef7f4f67b..e98e7b433a 100644 --- a/libavfilter/avf_showspectrum.c +++ b/libavfilter/avf_showspectrum.c @@ -27,7 +27,7 @@ #include #include "libavcodec/avfft.h" -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avfilter.h" #include "internal.h" diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c index 50a114baed..2adaa1f600 100644 --- a/libavfilter/avf_showwaves.c +++ b/libavfilter/avf_showwaves.c @@ -23,7 +23,7 @@ * audio to video multimedia filter */ -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "avfilter.h" diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c index e850669659..23396db4af 100644 --- a/libavfilter/f_ebur128.c +++ b/libavfilter/f_ebur128.c @@ -30,9 +30,9 @@ #include -#include "libavutil/audioconvert.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/xga_font_data.h" #include "libavutil/opt.h" #include "libavutil/timestamp.h" diff --git a/libavfilter/formats.c b/libavfilter/formats.c index c8c2257bb7..be69a1a3df 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/eval.h" #include "libavutil/pixdesc.h" #include "libavutil/parseutils.h" -#include "libavutil/audioconvert.h" #include "avfilter.h" #include "internal.h" #include "formats.h" diff --git a/libavfilter/graphdump.c b/libavfilter/graphdump.c index c9d0fb0a7c..45f64c0146 100644 --- a/libavfilter/graphdump.c +++ b/libavfilter/graphdump.c @@ -21,7 +21,7 @@ #include -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "libavutil/bprint.h" #include "libavutil/pixdesc.h" #include "avfilter.h" diff --git a/libavfilter/sink_buffer.c b/libavfilter/sink_buffer.c index 358b3e86f7..1c84989ee8 100644 --- a/libavfilter/sink_buffer.c +++ b/libavfilter/sink_buffer.c @@ -23,8 +23,8 @@ * buffer sink */ -#include "libavutil/audioconvert.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/fifo.h" #include "avfilter.h" #include "buffersink.h" diff --git a/libavfilter/src_buffer.c b/libavfilter/src_buffer.c index 354a516e20..acd490b974 100644 --- a/libavfilter/src_buffer.c +++ b/libavfilter/src_buffer.c @@ -31,8 +31,8 @@ #include "avcodec.h" #include "buffersrc.h" #include "asrc_abuffer.h" -#include "libavutil/audioconvert.h" #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/fifo.h" #include "libavutil/imgutils.h" diff --git a/libswresample/audioconvert.h b/libswresample/audioconvert.h index 9a234d4b93..d8af003671 100644 --- a/libswresample/audioconvert.h +++ b/libswresample/audioconvert.h @@ -31,7 +31,6 @@ #include "swresample_internal.h" #include "libavutil/cpu.h" -#include "libavutil/audioconvert.h" typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end); diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c index 3115c99dde..e23c45e852 100644 --- a/libswresample/rematrix.c +++ b/libswresample/rematrix.c @@ -19,8 +19,8 @@ */ #include "swresample_internal.h" -#include "libavutil/audioconvert.h" #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #define ONE (1.0) #define R(x) x diff --git a/libswresample/swresample-test.c b/libswresample/swresample-test.c index a0dfe28908..7f50cb48d0 100644 --- a/libswresample/swresample-test.c +++ b/libswresample/swresample-test.c @@ -20,8 +20,8 @@ */ #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/common.h" -#include "libavutil/audioconvert.h" #include "libavutil/opt.h" #include "swresample.h" diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 4564d440c9..041d2b2319 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -22,7 +22,7 @@ #include "swresample_internal.h" #include "audioconvert.h" #include "libavutil/avassert.h" -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h index 38b18d9d7e..459b1b0868 100644 --- a/libswresample/swresample_internal.h +++ b/libswresample/swresample_internal.h @@ -22,7 +22,7 @@ #define SWR_INTERNAL_H #include "swresample.h" -#include "libavutil/audioconvert.h" +#include "libavutil/channel_layout.h" #include "config.h" #define SQRT3_2 1.22474487139158904909 /* sqrt(3/2) */ diff --git a/tools/graph2dot.c b/tools/graph2dot.c index 4a30beb754..74075c7af2 100644 --- a/tools/graph2dot.c +++ b/tools/graph2dot.c @@ -25,9 +25,9 @@ #include #include +#include "libavutil/channel_layout.h" #include "libavutil/mem.h" #include "libavutil/pixdesc.h" -#include "libavutil/audioconvert.h" #include "libavfilter/avfiltergraph.h" #if !HAVE_GETOPT