From 1acd2f6ba7bc85d4aab6f0ebdc56c8d21785640e Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 13 Nov 2012 13:16:48 +0000 Subject: 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 --- 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 +- 20 files changed, 20 insertions(+), 20 deletions(-) (limited to 'libavfilter') diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c index 6dd8452..84e5e3c 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 77ea297..fa4f9f1 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 e400e1f..53c5dcd 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 467af76..0c075f6 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 c2d1fc1..06c80ac 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 2e2cac3..6ce4a78 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 8d1bb5b..3199efa 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 c456ac4..97d1ec7 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 1aca7d9..9438108 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 0ec6960..ab77a9c 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 c8b5e02..9baf3e2 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 6f8cc95..24bccd6 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 f13e8d0..8812c9e 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 4ef7f4f..e98e7b4 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 50a114b..2adaa1f 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 e850669..23396db 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 c8c2257..be69a1a 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 c9d0fb0..45f64c0 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 358b3e8..1c84989 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 354a516..acd490b 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" -- cgit v1.1