avcodec/avcodec: Stop including channel_layout.h in avcodec.h

Also include channel_layout.h directly wherever used.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

23 files changed, 26 insertions, 0 deletions

diff --git a/libavformat/alp.c b/libavformat/alp.c
index 4876015f4b..f46bdb4511 100644
--- a/libavformat/alp.c
+++ b/libavformat/alp.c
@@ -19,6 +19,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/channel_layout.h"
 #include "avformat.h"
 #include "internal.h"
 #include "rawenc.h"
diff --git a/libavformat/apm.c b/libavformat/apm.c
index 6a047c5095..a377fc4da7 100644
--- a/libavformat/apm.c
+++ b/libavformat/apm.c
@@ -23,6 +23,7 @@
 #include "internal.h"
 #include "rawenc.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 
diff --git a/libavformat/argo_asf.c b/libavformat/argo_asf.c
index ef647ae20c..0bc09522c0 100644
--- a/libavformat/argo_asf.c
+++ b/libavformat/argo_asf.c
@@ -21,6 +21,7 @@
  */
 #include "avformat.h"
 #include "internal.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/avassert.h"
 #include "libavutil/opt.h"
diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c
index 37288a1496..11f68c2405 100644
--- a/libavformat/argo_cvg.c
+++ b/libavformat/argo_cvg.c
@@ -19,6 +19,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/channel_layout.h"
 #include "avformat.h"
 #include "internal.h"
 #include "libavutil/opt.h"
diff --git a/libavformat/codec2.c b/libavformat/codec2.c
index 7dd60031b1..1ddba808dd 100644
--- a/libavformat/codec2.c
+++ b/libavformat/codec2.c
@@ -21,6 +21,7 @@
 
 #include <memory.h>
 #include "libavcodec/codec2utils.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
 #include "avio_internal.h"
diff --git a/libavformat/derf.c b/libavformat/derf.c
index a09433ba07..d50a853194 100644
--- a/libavformat/derf.c
+++ b/libavformat/derf.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
diff --git a/libavformat/dsfdec.c b/libavformat/dsfdec.c
index 690fd02bb3..02ee4c1231 100644
--- a/libavformat/dsfdec.c
+++ b/libavformat/dsfdec.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c
index 86b1101d6b..0ad1c937a9 100644
--- a/libavformat/eacdata.c
+++ b/libavformat/eacdata.c
@@ -28,6 +28,7 @@
  *  http://wiki.multimedia.cx/index.php?title=EA_Command_And_Conquer_3_Audio_Codec
  */
 
+#include "libavutil/channel_layout.h"
 #include "avformat.h"
 #include "internal.h"
 
diff --git a/libavformat/framehash.c b/libavformat/framehash.c
index 8d90793d7c..04c40825b9 100644
--- a/libavformat/framehash.c
+++ b/libavformat/framehash.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "internal.h"
 
 int ff_framehash_write_header(AVFormatContext *s)
diff --git a/libavformat/fwse.c b/libavformat/fwse.c
index 970d5ffe89..ed8cd3a6db 100644
--- a/libavformat/fwse.c
+++ b/libavformat/fwse.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
diff --git a/libavformat/genh.c b/libavformat/genh.c
index 6d36e5f5fc..f9b222d8cd 100644
--- a/libavformat/genh.c
+++ b/libavformat/genh.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/internal.h"
 #include "avformat.h"
diff --git a/libavformat/ifv.c b/libavformat/ifv.c
index f82328ada0..b3b9213aa5 100644
--- a/libavformat/ifv.c
+++ b/libavformat/ifv.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "avformat.h"
 #include "internal.h"
 #include "avio_internal.h"
diff --git a/libavformat/imx.c b/libavformat/imx.c
index e26f3728ff..6d3a5ad8d7 100644
--- a/libavformat/imx.c
+++ b/libavformat/imx.c
@@ -24,6 +24,7 @@
 #include "internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/internal.h"
 
 #define IMX_TAG MKTAG('I', 'M', 'A', 'X')
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 35c5eb982e..4df5440023 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -27,6 +27,7 @@
 #include "libavcodec/mpeg4audio.h"
 #include "libavcodec/mpegaudiodata.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 
 /* http://www.mp4ra.org */
diff --git a/libavformat/kvag.c b/libavformat/kvag.c
index b5ebe418e6..0be253fb3c 100644
--- a/libavformat/kvag.c
+++ b/libavformat/kvag.c
@@ -19,6 +19,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/channel_layout.h"
 #include "avformat.h"
 #include "internal.h"
 #include "rawenc.h"
diff --git a/libavformat/libopenmpt.c b/libavformat/libopenmpt.c
index d04aec5471..8006c085df 100644
--- a/libavformat/libopenmpt.c
+++ b/libavformat/libopenmpt.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "avformat.h"
 #include "internal.h"
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index c85efe8748..57062f45c5 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -43,6 +43,7 @@
 #include "libavcodec/raw.h"
 #include "internal.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/intfloat.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/libm.h"
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 4b7493395d..a7874cdae8 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"
diff --git a/libavformat/pp_bnk.c b/libavformat/pp_bnk.c
index 821d14a4aa..b1e1b6115e 100644
--- a/libavformat/pp_bnk.c
+++ b/libavformat/pp_bnk.c
@@ -23,6 +23,7 @@
 #include "internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/internal.h"
 
 #define PP_BNK_MAX_READ_SIZE    4096
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c
index df04b31893..43c8bf957a 100644
--- a/libavformat/riffenc.c
+++ b/libavformat/riffenc.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/dict.h"
 #include "libavutil/log.h"
 #include "libavutil/mathematics.h"
diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c
index dafdc4a1cc..bd72db5f08 100644
--- a/libavformat/sbgdec.c
+++ b/libavformat/sbgdec.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
diff --git a/libavformat/sga.c b/libavformat/sga.c
index 3dc62317a1..16e8fe516d 100644
--- a/libavformat/sga.c
+++ b/libavformat/sga.c
@@ -22,6 +22,7 @@
 
 #include "libavutil/intreadwrite.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/internal.h"
 #include "avformat.h"
 #include "internal.h"
diff --git a/libavformat/wsddec.c b/libavformat/wsddec.c
index a2fcdae2be..1f90f5b467 100644
--- a/libavformat/wsddec.c
+++ b/libavformat/wsddec.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/timecode.h"
 #include "avformat.h"