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>
2024-11-21 10:55:51 +02:00 · 2021-06-12 01:10:58 +02:00 · 2021-06-12 01:10:58 +02:00 · 1be3d8a0cb
commit 1be3d8a0cb
parent 57b5ec6ba7
93 changed files with 95 additions and 1 deletions
--- a/doc/examples/filtering_audio.c
+++ b/doc/examples/filtering_audio.c
@ -34,6 +34,7 @@
 #include <libavformat/avformat.h>
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
+#include <libavutil/channel_layout.h>
 #include <libavutil/opt.h>

 static const char *filter_descr = "aresample=8000,aformat=sample_fmts=s16:channel_layouts=mono";
--- a/doc/examples/transcode_aac.c
+++ b/doc/examples/transcode_aac.c
@ -38,6 +38,7 @@
 #include "libavutil/audio_fifo.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/frame.h"
 #include "libavutil/opt.h"

--- a/doc/examples/transcoding.c
+++ b/doc/examples/transcoding.c
@ -32,6 +32,7 @@
 #include <libavformat/avformat.h>
 #include <libavfilter/buffersink.h>
 #include <libavfilter/buffersrc.h>
+#include <libavutil/channel_layout.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixdesc.h>

--- a/fftools/cmdutils.c
+++ b/fftools/cmdutils.c
@ -41,6 +41,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/display.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/imgutils.h"
--- a/fftools/ffplay.c
+++ b/fftools/ffplay.c
@ -31,6 +31,7 @@
 #include <stdint.h>

 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/eval.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/pixdesc.h"
--- a/fftools/ffprobe.c
+++ b/fftools/ffprobe.c
@ -33,6 +33,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/display.h"
 #include "libavutil/hash.h"
 #include "libavutil/hdr_dynamic_metadata.h"
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@ -89,6 +89,7 @@
           Parametric Stereo.
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/thread.h"

 static VLC vlc_scalefactors;
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@ -30,6 +30,7 @@
 ***********************************/
 #include <float.h>

+#include "libavutil/channel_layout.h"
 #include "libavutil/libm.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/opt.h"
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@ -22,6 +22,7 @@
 #ifndef AVCODEC_AACENC_H
 #define AVCODEC_AACENC_H

+#include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/mem_internal.h"

--- a/libavcodec/aacenctab.h
+++ b/libavcodec/aacenctab.h
@ -28,6 +28,7 @@
 #ifndef AVCODEC_AACENCTAB_H
 #define AVCODEC_AACENCTAB_H

+#include "libavutil/channel_layout.h"
 #include "aac.h"

 /** Total number of usable codebooks **/
--- a/libavcodec/aptxdec.c
+++ b/libavcodec/aptxdec.c
@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "aptx.h"

 /*
--- a/libavcodec/aptxenc.c
+++ b/libavcodec/aptxenc.c
@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "aptx.h"
 #include "encode.h"

--- a/libavcodec/atrac9dec.c
+++ b/libavcodec/atrac9dec.c
@ -19,6 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/thread.h"

 #include "internal.h"
--- a/libavcodec/audiotoolboxdec.c
+++ b/libavcodec/audiotoolboxdec.c
@ -29,6 +29,7 @@
 #include "internal.h"
 #include "mpegaudiodecheader.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/log.h"

--- a/libavcodec/audiotoolboxenc.c
+++ b/libavcodec/audiotoolboxenc.c
@ -33,6 +33,7 @@
 #include "internal.h"
 #include "libavformat/isom.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/log.h"

--- a/libavcodec/avcodec.c
+++ b/libavcodec/avcodec.c
@ -27,6 +27,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@ -33,7 +33,6 @@
 #include "libavutil/avutil.h"
 #include "libavutil/buffer.h"
 #include "libavutil/cpu.h"
-#include "libavutil/channel_layout.h"
 #include "libavutil/dict.h"
 #include "libavutil/frame.h"
 #include "libavutil/hwcontext.h"
--- a/libavcodec/dca_core.c
+++ b/libavcodec/dca_core.c
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "dcaadpcm.h"
 #include "dcadec.h"
 #include "dcadata.h"
--- a/libavcodec/dca_xll.c
+++ b/libavcodec/dca_xll.c
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "dcadec.h"
 #include "dcadata.h"
 #include "dcamath.h"
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@ -30,6 +30,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/frame.h"
 #include "libavutil/hwcontext.h"
--- a/libavcodec/dolby_e.c
+++ b/libavcodec/dolby_e.c
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/thread.h"
 #include "libavutil/mem.h"
--- a/libavcodec/dolby_e_parser.c
+++ b/libavcodec/dolby_e_parser.c
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "dolby_e.h"
 #include "get_bits.h"
--- a/libavcodec/dvaudiodec.c
+++ b/libavcodec/dvaudiodec.c
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "internal.h"
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@ -20,6 +20,7 @@

 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/frame.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
--- a/libavcodec/evrcdec.c
+++ b/libavcodec/evrcdec.c
@ -25,6 +25,7 @@
 * @author Paul B Mahol
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@ -20,6 +20,7 @@
 */

 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
 #include "libavutil/intmath.h"
 #include "libavutil/md5.h"
--- a/libavcodec/g722enc.c
+++ b/libavcodec/g722enc.c
@ -28,6 +28,7 @@
 */

 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "encode.h"
 #include "internal.h"
--- a/libavcodec/ilbcdec.c
+++ b/libavcodec/ilbcdec.c
@ -30,6 +30,7 @@
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "internal.h"
 #include "get_bits.h"
--- a/libavcodec/libcodec2.c
+++ b/libavcodec/libcodec2.c
@ -20,6 +20,7 @@
 */

 #include <codec2/codec2.h>
+#include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "libavutil/opt.h"
 #include "encode.h"
--- a/libavcodec/libgsmenc.c
+++ b/libavcodec/libgsmenc.c
@ -34,6 +34,7 @@
 #include <gsm/gsm.h>
 #endif

+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"

 #include "avcodec.h"
--- a/libavcodec/libopusenc.c
+++ b/libavcodec/libopusenc.c
@ -22,6 +22,7 @@
 #include <opus.h>
 #include <opus_multistream.h>

+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "bytestream.h"
--- a/libavcodec/libshine.c
+++ b/libavcodec/libshine.c
@ -21,6 +21,7 @@

 #include <shine/layer3.h>

+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "audio_frame_queue.h"
 #include "avcodec.h"
--- a/libavcodec/libtwolame.c
+++ b/libavcodec/libtwolame.c
@ -26,6 +26,7 @@

 #include <twolame.h>

+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/opt.h"

--- a/libavcodec/libvorbisenc.c
+++ b/libavcodec/libvorbisenc.c
@ -21,6 +21,7 @@
 #include <vorbis/vorbisenc.h>

 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/fifo.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
--- a/libavcodec/mlp.c
+++ b/libavcodec/mlp.c
@ -21,6 +21,7 @@

 #include <stdint.h>

+#include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/thread.h"
--- a/libavcodec/mlpenc.c
+++ b/libavcodec/mlpenc.c
@ -25,6 +25,7 @@
 #include "internal.h"
 #include "put_bits.h"
 #include "audio_frame_queue.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
 #include "libavutil/avstring.h"
 #include "libavutil/samplefmt.h"
--- a/libavcodec/mpegaudioenc_fixed.c
+++ b/libavcodec/mpegaudioenc_fixed.c
@ -19,6 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "mpegaudioenc_template.c"

 const AVCodec ff_mp2fixed_encoder = {
--- a/libavcodec/mpegaudioenc_float.c
+++ b/libavcodec/mpegaudioenc_float.c
@ -19,6 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #define USE_FLOATS 1
 #include "mpegaudioenc_template.c"

--- a/libavcodec/opus.c
+++ b/libavcodec/opus.c
@ -26,6 +26,7 @@

 #include <stdint.h>

+#include "libavutil/channel_layout.h"
 #include "libavutil/error.h"
 #include "libavutil/ffmath.h"

--- a/libavcodec/opusenc.c
+++ b/libavcodec/opusenc.c
@ -25,6 +25,7 @@
 #include "opusenc_psy.h"
 #include "opustab.h"

+#include "libavutil/channel_layout.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/opt.h"
--- a/libavcodec/pafaudio.c
+++ b/libavcodec/pafaudio.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 "avcodec.h"
--- a/libavcodec/pcm-dvdenc.c
+++ b/libavcodec/pcm-dvdenc.c
@ -19,6 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "encode.h"
--- a/libavcodec/ra144enc.c
+++ b/libavcodec/ra144enc.c
@ -27,6 +27,7 @@

 #include <float.h>

+#include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "audio_frame_queue.h"
 #include "celp_filters.h"
--- a/libavcodec/s302m.c
+++ b/libavcodec/s302m.c
@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
 #include "libavutil/log.h"
--- a/libavcodec/s302menc.c
+++ b/libavcodec/s302menc.c
@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "encode.h"
 #include "internal.h"
--- a/libavcodec/sbcdec.c
+++ b/libavcodec/sbcdec.c
@ -32,6 +32,7 @@

 #include "avcodec.h"
 #include "internal.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem_internal.h"
 #include "sbc.h"
--- a/libavcodec/sbcenc.c
+++ b/libavcodec/sbcenc.c
@ -30,6 +30,7 @@
 * SBC encoder implementation
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "encode.h"
--- a/libavcodec/siren.c
+++ b/libavcodec/siren.c
@ -21,6 +21,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/tx.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/mem_internal.h"
--- a/libavcodec/tak.c
+++ b/libavcodec/tak.c
@ -19,6 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
 #include "libavutil/intreadwrite.h"

--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@ -29,6 +29,7 @@

 #include <limits.h>

+#include "libavutil/channel_layout.h"
 #include "libavutil/crc.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@ -28,6 +28,7 @@
 #include "config.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
--- a/libavcodec/wavpackenc.c
+++ b/libavcodec/wavpackenc.c
@ -20,6 +20,7 @@

 #define BITSTREAM_WRITER_LE

+#include "libavutil/channel_layout.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
--- a/libavdevice/avfoundation.m
+++ b/libavdevice/avfoundation.m
@ -28,6 +28,7 @@
 #import <AVFoundation/AVFoundation.h>
 #include <pthread.h>

+#include "libavutil/channel_layout.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/opt.h"
 #include "libavutil/avstring.h"
--- a/libavdevice/pulse_audio_enc.c
+++ b/libavdevice/pulse_audio_enc.c
@ -23,6 +23,7 @@
 #include <pulse/error.h>
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/internal.h"
 #include "libavutil/opt.h"
 #include "libavutil/time.h"
--- a/libavfilter/af_afir.c
+++ b/libavfilter/af_afir.c
@ -26,6 +26,7 @@
 #include <float.h>

 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/float_dsp.h"
 #include "libavutil/intreadwrite.h"
--- a/libavfilter/af_apulsator.c
+++ b/libavfilter/af_apulsator.c
@ -19,6 +19,7 @@
 */

 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "internal.h"
--- a/libavfilter/af_biquads.c
+++ b/libavfilter/af_biquads.c
@ -63,6 +63,7 @@
 */

 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/ffmath.h"
 #include "libavutil/opt.h"
 #include "audio.h"
--- a/libavfilter/af_firequalizer.c
+++ b/libavfilter/af_firequalizer.c
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/eval.h"
 #include "libavutil/avassert.h"
--- a/libavfilter/af_hdcd.c
+++ b/libavfilter/af_hdcd.c
@ -43,6 +43,7 @@
 * HDCD decoding filter
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/avassert.h"
 #include "avfilter.h"
--- a/libavfilter/af_speechnorm.c
+++ b/libavfilter/af_speechnorm.c
@ -28,6 +28,7 @@
 #include <float.h>

 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"

 #define FF_BUFQUEUE_SIZE (1024)
--- a/libavfilter/asrc_afirsrc.c
+++ b/libavfilter/asrc_afirsrc.c
@ -18,6 +18,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/eval.h"
 #include "libavutil/opt.h"
 #include "libavutil/tx.h"
--- a/libavfilter/asrc_anoisesrc.c
+++ b/libavfilter/asrc_anoisesrc.c
@ -18,6 +18,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "audio.h"
 #include "avfilter.h"
--- a/libavfilter/asrc_hilbert.c
+++ b/libavfilter/asrc_hilbert.c
@ -18,6 +18,7 @@
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "audio.h"
 #include "avfilter.h"
--- a/libavfilter/asrc_sinc.c
+++ b/libavfilter/asrc_sinc.c
@ -20,6 +20,7 @@
 */

 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"

 #include "libavcodec/avfft.h"
--- a/libavfilter/avf_showcqt.c
+++ b/libavfilter/avf_showcqt.c
@ -21,6 +21,7 @@
 #include "config.h"
 #include "libavcodec/avfft.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/xga_font_data.h"
 #include "libavutil/eval.h"
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@ -33,6 +33,7 @@
 #include "libavutil/attributes.h"
 #include "libavutil/avstring.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
--- a/libavfilter/tests/formats.c
+++ b/libavfilter/tests/formats.c
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavfilter/formats.c"

 #undef printf
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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)
--- 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"
--- 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"
--- 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"
--- 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')
--- 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 */
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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"
--- 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"
--- 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"
--- 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"
--- a/libswresample/options.c
+++ b/libswresample/options.c
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "swresample_internal.h"

--- a/libswresample/swresample_frame.c
+++ b/libswresample/swresample_frame.c
@ -20,6 +20,7 @@
 */

 #include "swresample_internal.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/frame.h"
 #include "libavutil/opt.h"

--- a/tests/api/api-flac-test.c
+++ b/tests/api/api-flac-test.c
@ -28,6 +28,7 @@
 */

 #include "libavcodec/avcodec.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/samplefmt.h"