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

Also reorder some other #include when applicable.

15 files changed, 24 insertions, 26 deletions

diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index 77c16be4a2..2059cf2b49 100644
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -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"
 
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
index dde9595ff4..7ef94b9e97 100644
--- a/libavfilter/af_amix.c
+++ b/libavfilter/af_amix.c
@@ -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"
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
index 00e0322f5c..bcf821ac65 100644
--- a/libavfilter/af_ashowinfo.c
+++ b/libavfilter/af_ashowinfo.c
@@ -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"
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
index f70b48102c..4f9ee860df 100644
--- a/libavfilter/af_channelmap.c
+++ b/libavfilter/af_channelmap.c
@@ -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"
diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
index 92fb27e092..e8ceb9c016 100644
--- a/libavfilter/af_channelsplit.c
+++ b/libavfilter/af_channelsplit.c
@@ -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"
 
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index 7e3a542392..c810e594f8 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -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"
 
diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index 7096ceafbd..4cbaa81bc9 100644
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@@ -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;
diff --git a/libavfilter/audio.c b/libavfilter/audio.c
index 66010c18c5..48e038b842 100644
--- a/libavfilter/audio.c
+++ b/libavfilter/audio.c
@@ -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"
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 1e3b001fcd..c7db857ef0 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -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"
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index adb8b797d8..01d39b6c0b 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -478,7 +478,7 @@ struct AVFilterLink {
     int h;                      ///< agreed upon image height
     AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio
     /* These two parameters apply only to audio */
-    uint64_t channel_layout;    ///< channel layout of current buffer (see libavutil/audioconvert.h)
+    uint64_t channel_layout;    ///< channel layout of current buffer (see libavutil/channel_layout.h)
     int sample_rate;            ///< samples per second
 
     int format;                 ///< agreed upon media format
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 4a66c7842a..f5c9984b6a 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -23,16 +23,15 @@
 #include <ctype.h>
 #include <string.h>
 
+#include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
+#include "libavutil/log.h"
 #include "avfilter.h"
 #include "avfiltergraph.h"
 #include "formats.h"
 #include "internal.h"
 
-#include "libavutil/audioconvert.h"
-#include "libavutil/avassert.h"
-#include "libavutil/common.h"
-#include "libavutil/log.h"
-
 static const AVClass filtergraph_class = {
     .class_name = "AVFilterGraph",
     .item_name  = av_default_item_name,
diff --git a/libavfilter/buffer.c b/libavfilter/buffer.c
index 439425a3ee..8eb3ce36d1 100644
--- a/libavfilter/buffer.c
+++ b/libavfilter/buffer.c
@@ -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 "libavcodec/avcodec.h"
 
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index c68b909d57..96f5351635 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -24,8 +24,8 @@
  */
 
 #include "libavutil/audio_fifo.h"
-#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index a2d5edbd5e..9354691862 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -23,6 +23,12 @@
  * memory buffer source filter
  */
 
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
+#include "libavutil/fifo.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
+#include "libavutil/samplefmt.h"
 #include "audio.h"
 #include "avfilter.h"
 #include "buffersrc.h"
@@ -30,13 +36,6 @@
 #include "internal.h"
 #include "video.h"
 
-#include "libavutil/audioconvert.h"
-#include "libavutil/common.h"
-#include "libavutil/fifo.h"
-#include "libavutil/imgutils.h"
-#include "libavutil/opt.h"
-#include "libavutil/samplefmt.h"
-
 typedef struct {
     const AVClass    *class;
     AVFifoBuffer     *fifo;
diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c
index b13be68015..1bfacafd50 100644
--- a/libavfilter/fifo.c
+++ b/libavfilter/fifo.c
@@ -24,7 +24,7 @@
  */
 
 #include "libavutil/avassert.h"
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/samplefmt.h"