From patchwork Mon Jun 14 22:41:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 28286 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp3249157ybk; Mon, 14 Jun 2021 15:41:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBOfZERPQZsgaiiS1CcLYrK2vrSzyWhhTtAAwMteP1rcMdi4q1t0yIGPSkwVm2gOvTCdTM X-Received: by 2002:a17:906:39d7:: with SMTP id i23mr17247442eje.121.1623710518871; Mon, 14 Jun 2021 15:41:58 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 9si9364890ejd.281.2021.06.14.15.41.58; Mon, 14 Jun 2021 15:41:58 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="hPe8E/RG"; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97CE36897E8; Tue, 15 Jun 2021 01:41:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2044.outbound.protection.outlook.com [40.92.51.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFD37680618 for ; Tue, 15 Jun 2021 01:41:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iJcJj5JOQrEpBU+uEOOvyKclEx3MwQbeT9ZYLa7OiR2TNBWcL2sgJav3fyEsKuRJNHvr4ANf3byJpmIT+zod3eyKNpLi+MP27TwO3K7QdROXyRFiWpIPjgKWNPaUwue0xx/4v1jjUMSaCILXNCGNJH8Gz5FhdQIcJwX4lbgI3avX0BUairpK2xZ2zhop4FUkIhSt4+47vHDJjBNdR7GMUoQo9QAk1t++YU3mKQEaMPpEMwHLfCSQVOQ3owtnrxd0MmAXVIFiMIFPFV8HN4X4pDdktrXhCCazMoDoALHqpXFTnpas+03Jm2ru5MKSqoFnRV35QuvoAXxGyJRM8Gdsvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VtFu3v0NWYU3UcfWBDbRtwcFFfJn5G2g754i9Rvq8E8=; b=IE3TiQTQw7/7ZglLz1Crj5shrvb9TrOryE65YMMqGwmMBhgln0dDqk+F47lNArz+5+C3fDpxIfBdGjSkJCnqubbJO2tWGRKzO5x/ZUkJ+OowUhxSAY0l6mNJGJTWAEQIZXzw4sgHSrQITmPG2ee3y5XpLeAa9BB8WDIp1WElfP6RV+FcrmQ3Ax94RHStJC6HU7yS4oUBzH2BtFJGEUN98ZfYT3FHyOK4P94Uy7nRGLZHKFTmzblUjvUukx6hncFOu6JCgIchMjToCmcRS1KgzVjAETOLyH5gm1O9NPFKG78jQ6HHETADsHGeU4k/io/qEqkjPC4Bj89fvIeYV4ftuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VtFu3v0NWYU3UcfWBDbRtwcFFfJn5G2g754i9Rvq8E8=; b=hPe8E/RGg/RGuU85bw5kjlLwCI23Mqwo4biP/D5dYPMsMREEJx6zZRwFUIsVw2lqebol2Cds/1OTPSq1duGRzdyNjC+uzue+hrcSaDr1LtgIYSf6EA1lW/RzOifjLPdgL8ITJoFKcfYPdG9RqXvYwznQP11gbgrSlVD+RPCYAvalxlAKu6xCCYsStPyU7becRyIF5mlzTadoHnJhbFSgthzhWbLxT1mDpcxhzi5SN7d1cHSAN0F0+21LxNFKW/mIS0fPX6oxeyZb3ODVBmq8GqDc8Yk74NjAihDep7boTwiyxQ3l210LXuH7cBWlnIg3DTV2gfTDqsdObhs6UrhtBA== Received: from DB8EUR06FT015.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::43) by DB8EUR06HT118.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc35::447) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Mon, 14 Jun 2021 22:41:42 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc35::46) by DB8EUR06FT015.mail.protection.outlook.com (2a01:111:e400:fc35::156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Mon, 14 Jun 2021 22:41:42 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7DBB8B4C08138F33B6336828F3D89BB8792CEAC89A7BF58C7E58CBB3E29A4342; UpperCasedChecksum:147DCE78228A85E0F4940E3D21162FAB65B2B6204A063A64041114DF64D80956; SizeAsReceived:7605; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::f4cc:63fc:9cef:37fb%6]) with mapi id 15.20.4219.025; Mon, 14 Jun 2021 22:41:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 00:41:18 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [5c5fUzNJ98JkoLZz0JX+f86W5H/qI8nP] X-ClientProxiedBy: AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210614224134.1029350-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.97.82) by AM0PR10CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Mon, 14 Jun 2021 22:41:41 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ac9515b0-a299-4da6-54c6-08d92f859436 X-MS-Exchange-SLBlob-MailProps: VCKv1Cle4b3co6Dq8ohnXJ2DV3m4TXE1F2YhEkWEzJ1QWUBfq2P1cntACLghMajvUzeOdQ0/Z49fDvK704opMqPqxUk8NZdn7T82G1UfABvZneV2adSDubHATAc2ewtP/m7GFqm11OgSRZZy0njDIn3mvQLfaY16NRrYvMz3NmqHA21Z8dy7ONa/potWeskDF7WziTNWHfldPRCDkjo5IjiueIVxQtMZrZPrIgnoUmNDtiyYcmC3jG/nqcd/cwY+JGMMHTwAarQNYNhdYxpjoJLUelsWGWZJi5JIxM/7v8rS8ij0WJVSmihxkgGVxysPRlsLhIuI7QLtfLWspJZhXhEZJhE4uU1I2cQYtmwDAIv4dDthYFMKi2hUQF7pbcvCCZgohKw9EbpwcVIxzYiIZqBuGSuHMzTucJQjEfQ9eSEAZ7ikOCrJWhR7ccStiFqfUpeyfFadbI09PxFjKSDFkyblRRroN/zBOkI0TUuLXkKtfaWdV8he50XD8fUVjdfs3/xDyNS0XngK1/001wdvhnXsCMZsMM7Xr21n7AL1bA36rMoEk49rvf9UMsVjlILIfAGdLGDmvpdlKXySeJlTRCkLvwf38xFT+KdvIYBoL/YgWjZX0NP/LQ2QndixjREV3p1eIwGwFxgP57HZgqN8gq202H0pX8Bezo5XqaiVRQBJ5pPx7RmkMFsRY+AH30CRmnPZ1Wtd2vjQcliQFsxsN607IynOiUN9G1KZQD930tH395p1dm1fR+/JdbfiN7mjw+QptZAwL9XI5MZjdZmb9+51PEJDATdGXG3jop2aNVMUl5b7+Zwtaegib7iTUpE2swXmUsQy3VcM8pt947zhJ9D2AX6cqKitnSXQA9h/NZSjh1kXn0w0FKaXizfWjJKHhw/yQwiCuDhHpwWl0trYPU/vPZKNHO3KHS92q8/712ERVWxj8v7IAZ8IGdau5nDx0hcroWbNtPSTd2Wfuk+He59ASjbwHYgVtoPsn+5RmaYNWyPJAjrIVRAeSWwJkHyPtNSYlb3QX5qzhEbCi6wuxJzEXt0hwUJ272nF1cNcmsc= X-MS-TrafficTypeDiagnostic: DB8EUR06HT118: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1oxAtmnz6XzkRq7o8F+QhAYPtp+6yGpf00hBGcDR78amyM1Ino9WbRPoNCEqToKUy57G34MkukgZv7L2GHWK4ZYqZAMRtOQxxQGTPm7DiBzl1zQs6xBah2oALQUzq9WqK89h4qlxXMokv3afacqycDd5nBgDtoJlSXCN/nzDkRdM8e6MqDNFhemvjKY0JS9umBwEk6YBx4eDkGTeiCIkEHlFTFfC2pS5sgInsSJ2vv5T80x4MCPgvk7vkr5FiXV1mGvhCvzmQVei2tfR43BmqHZknVccaZX9gx8MXcgzUfKVWQXcheisvhf1oEA1HYcD3Y8bwPeRst6uynzHXwOnK7qMZotcMCbZivGUQMjQPgMF/R4SGyTezDusmQf4e0Fq/g3SZjW4GpjTD3yreDzGGM2TH8501/607pyW6LnY1aqICGxMcX7q75V3AjlNec3SuHVufSokwWj4dXN0/8Kl+g== X-MS-Exchange-AntiSpam-MessageData: n0H3EOccqtVhHvJJLF1oxpw1IaOZa/paekiVRctjsC6EofbU8yVTqgEcMUndymAJTK8pPIoZ22SeEICvcocJ2s3gIxrMFfySKsWYobOFDJF2GRSt/2serW7O0jwTIsAQRMl8up0er6/ZzTkmy1ZGXA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac9515b0-a299-4da6-54c6-08d92f859436 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2021 22:41:41.6888 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DB8EUR06FT015.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8EUR06HT118 Subject: [FFmpeg-devel] [PATCH 02/17] avcodec/avcodec: Stop including channel_layout.h in avcodec.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gPkyhZtdXvMB Content-Length: 37863 Also include channel_layout.h directly wherever used. Signed-off-by: Andreas Rheinhardt --- doc/examples/filtering_audio.c | 1 + doc/examples/transcode_aac.c | 1 + doc/examples/transcoding.c | 1 + fftools/cmdutils.c | 1 + fftools/ffplay.c | 1 + fftools/ffprobe.c | 1 + libavcodec/aacdec_template.c | 1 + libavcodec/aacenc.c | 1 + libavcodec/aacenc.h | 1 + libavcodec/aacenctab.h | 1 + libavcodec/aptxdec.c | 1 + libavcodec/aptxenc.c | 1 + libavcodec/atrac9dec.c | 1 + libavcodec/audiotoolboxdec.c | 1 + libavcodec/audiotoolboxenc.c | 1 + libavcodec/avcodec.c | 1 + libavcodec/avcodec.h | 1 - libavcodec/dca_core.c | 1 + libavcodec/dca_xll.c | 1 + libavcodec/decode.c | 1 + libavcodec/dolby_e.c | 1 + libavcodec/dolby_e_parser.c | 1 + libavcodec/dvaudiodec.c | 1 + libavcodec/encode.c | 1 + libavcodec/evrcdec.c | 1 + libavcodec/flacenc.c | 1 + libavcodec/g722enc.c | 1 + libavcodec/ilbcdec.c | 1 + libavcodec/libcodec2.c | 1 + libavcodec/libgsmenc.c | 1 + libavcodec/libopusenc.c | 1 + libavcodec/libshine.c | 1 + libavcodec/libtwolame.c | 1 + libavcodec/libvorbisenc.c | 1 + libavcodec/mlp.c | 1 + libavcodec/mlpenc.c | 1 + libavcodec/mpegaudioenc_fixed.c | 1 + libavcodec/mpegaudioenc_float.c | 1 + libavcodec/opus.c | 1 + libavcodec/opusenc.c | 1 + libavcodec/pafaudio.c | 1 + libavcodec/pcm-dvdenc.c | 1 + libavcodec/ra144enc.c | 1 + libavcodec/s302m.c | 1 + libavcodec/s302menc.c | 1 + libavcodec/sbcdec.c | 1 + libavcodec/sbcenc.c | 1 + libavcodec/siren.c | 1 + libavcodec/tak.c | 1 + libavcodec/tta.c | 1 + libavcodec/utils.c | 1 + libavcodec/wavpackenc.c | 1 + libavdevice/avfoundation.m | 1 + libavdevice/pulse_audio_enc.c | 1 + libavfilter/af_afir.c | 1 + libavfilter/af_apulsator.c | 1 + libavfilter/af_biquads.c | 1 + libavfilter/af_firequalizer.c | 1 + libavfilter/af_hdcd.c | 1 + libavfilter/af_speechnorm.c | 1 + libavfilter/asrc_afirsrc.c | 1 + libavfilter/asrc_anoisesrc.c | 1 + libavfilter/asrc_hilbert.c | 1 + libavfilter/asrc_sinc.c | 1 + libavfilter/avf_showcqt.c | 1 + libavfilter/src_movie.c | 1 + libavfilter/tests/formats.c | 1 + libavformat/alp.c | 2 ++ libavformat/apm.c | 1 + libavformat/argo_asf.c | 1 + libavformat/argo_cvg.c | 2 ++ libavformat/codec2.c | 1 + libavformat/derf.c | 1 + libavformat/dsfdec.c | 1 + libavformat/eacdata.c | 1 + libavformat/framehash.c | 1 + libavformat/fwse.c | 1 + libavformat/genh.c | 1 + libavformat/ifv.c | 1 + libavformat/imx.c | 1 + libavformat/isom.c | 1 + libavformat/kvag.c | 2 ++ libavformat/libopenmpt.c | 1 + libavformat/movenc.c | 1 + libavformat/mpeg.c | 1 + libavformat/pp_bnk.c | 1 + libavformat/riffenc.c | 1 + libavformat/sbgdec.c | 1 + libavformat/sga.c | 1 + libavformat/wsddec.c | 1 + libswresample/options.c | 1 + libswresample/swresample_frame.c | 1 + tests/api/api-flac-test.c | 1 + 93 files changed, 95 insertions(+), 1 deletion(-) diff --git a/doc/examples/filtering_audio.c b/doc/examples/filtering_audio.c index 508c19c60b..2af73a7031 100644 --- a/doc/examples/filtering_audio.c +++ b/doc/examples/filtering_audio.c @@ -34,6 +34,7 @@ #include #include #include +#include #include static const char *filter_descr = "aresample=8000,aformat=sample_fmts=s16:channel_layouts=mono"; diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c index 711076b5a5..1cf6317e27 100644 --- 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" diff --git a/doc/examples/transcoding.c b/doc/examples/transcoding.c index 3a97426e2c..51c120dfb7 100644 --- a/doc/examples/transcoding.c +++ b/doc/examples/transcoding.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index f72231790f..553ef0fe4f 100644 --- 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" diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 826c3ba5b4..833830bfc8 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -31,6 +31,7 @@ #include #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/eval.h" #include "libavutil/mathematics.h" #include "libavutil/pixdesc.h" diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 2d452c212e..9ca28c93e7 100644 --- 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" diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index d78e60ec2e..fd46a7d222 100644 --- 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; diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 23bfa20eaf..e462566078 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -30,6 +30,7 @@ ***********************************/ #include +#include "libavutil/channel_layout.h" #include "libavutil/libm.h" #include "libavutil/float_dsp.h" #include "libavutil/opt.h" diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 8ffc94f99b..b106910ce0 100644 --- 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" diff --git a/libavcodec/aacenctab.h b/libavcodec/aacenctab.h index dbbdf61dfd..f54dd16bed 100644 --- 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 **/ diff --git a/libavcodec/aptxdec.c b/libavcodec/aptxdec.c index e7e5459bbf..bdcc076c41 100644 --- 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" /* diff --git a/libavcodec/aptxenc.c b/libavcodec/aptxenc.c index 733ebc42c3..5ea6053c26 100644 --- 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" diff --git a/libavcodec/atrac9dec.c b/libavcodec/atrac9dec.c index eebb412145..1063044815 100644 --- 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" diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c index cbd381ef12..a222cde62e 100644 --- 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" diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index f599802b7b..9245aa9dc4 100644 --- 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" diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 3b3a3ef05a..6d60026c07 100644 --- 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" diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f6d2cde441..292c373c68 100644 --- 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" diff --git a/libavcodec/dca_core.c b/libavcodec/dca_core.c index accc5efd51..f0a3c18d62 100644 --- 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" diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c index d265cab8df..ab14dbcc88 100644 --- 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" diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 6def4047e5..71c76d33b2 100644 --- 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" diff --git a/libavcodec/dolby_e.c b/libavcodec/dolby_e.c index cd4c8c2c3c..6c0d54be4c 100644 --- 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" diff --git a/libavcodec/dolby_e_parser.c b/libavcodec/dolby_e_parser.c index ab8f1b6ef1..23bddd14f3 100644 --- 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" diff --git a/libavcodec/dvaudiodec.c b/libavcodec/dvaudiodec.c index e12f43c485..82e6dbe36c 100644 --- 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" diff --git a/libavcodec/encode.c b/libavcodec/encode.c index a569904f2c..98dfbfdff3 100644 --- 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" diff --git a/libavcodec/evrcdec.c b/libavcodec/evrcdec.c index 75de6cf803..59fcb14c52 100644 --- 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" diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index de36d33333..595928927d 100644 --- 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" diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c index bb011fb81b..75b926ef8e 100644 --- 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" diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c index 3df46b242f..4d0465087f 100644 --- 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" diff --git a/libavcodec/libcodec2.c b/libavcodec/libcodec2.c index 2996dc42f5..ab9250143b 100644 --- a/libavcodec/libcodec2.c +++ b/libavcodec/libcodec2.c @@ -20,6 +20,7 @@ */ #include +#include "libavutil/channel_layout.h" #include "avcodec.h" #include "libavutil/opt.h" #include "encode.h" diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c index 97ba789046..a2f6c1c62e 100644 --- a/libavcodec/libgsmenc.c +++ b/libavcodec/libgsmenc.c @@ -34,6 +34,7 @@ #include #endif +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "avcodec.h" diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 6602500f26..82002ac346 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -22,6 +22,7 @@ #include #include +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avcodec.h" #include "bytestream.h" diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c index 04d5914701..fbc84846ae 100644 --- a/libavcodec/libshine.c +++ b/libavcodec/libshine.c @@ -21,6 +21,7 @@ #include +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "audio_frame_queue.h" #include "avcodec.h" diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c index 1f6808b6f5..a71febc91f 100644 --- a/libavcodec/libtwolame.c +++ b/libavcodec/libtwolame.c @@ -26,6 +26,7 @@ #include +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/opt.h" diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c index ec674695d4..fa0d5f4b42 100644 --- a/libavcodec/libvorbisenc.c +++ b/libavcodec/libvorbisenc.c @@ -21,6 +21,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/fifo.h" #include "libavutil/opt.h" #include "avcodec.h" diff --git a/libavcodec/mlp.c b/libavcodec/mlp.c index 74363c3b95..dcec145eb0 100644 --- a/libavcodec/mlp.c +++ b/libavcodec/mlp.c @@ -21,6 +21,7 @@ #include +#include "libavutil/channel_layout.h" #include "libavutil/crc.h" #include "libavutil/intreadwrite.h" #include "libavutil/thread.h" diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index 7693feb127..8b61fc6b1e 100644 --- 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" diff --git a/libavcodec/mpegaudioenc_fixed.c b/libavcodec/mpegaudioenc_fixed.c index ce8963fd0b..fb1ba4e1bf 100644 --- 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 = { diff --git a/libavcodec/mpegaudioenc_float.c b/libavcodec/mpegaudioenc_float.c index ba3b096579..accb909a6f 100644 --- 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" diff --git a/libavcodec/opus.c b/libavcodec/opus.c index 64de246720..5ca6ca92f3 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -26,6 +26,7 @@ #include +#include "libavutil/channel_layout.h" #include "libavutil/error.h" #include "libavutil/ffmath.h" diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c index 7b22b929f7..b7f4760a25 100644 --- 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" diff --git a/libavcodec/pafaudio.c b/libavcodec/pafaudio.c index cb80f3a186..969eb7fa97 100644 --- 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" diff --git a/libavcodec/pcm-dvdenc.c b/libavcodec/pcm-dvdenc.c index ae7de65f1d..c9afac69d2 100644 --- 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" diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 4d12294c97..7a96354633 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -27,6 +27,7 @@ #include +#include "libavutil/channel_layout.h" #include "avcodec.h" #include "audio_frame_queue.h" #include "celp_filters.h" diff --git a/libavcodec/s302m.c b/libavcodec/s302m.c index 60d1547884..b09c1293a0 100644 --- 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" diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c index 33633627f6..528d712e79 100644 --- 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" diff --git a/libavcodec/sbcdec.c b/libavcodec/sbcdec.c index db61f43a5a..e14d8c8958 100644 --- 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" diff --git a/libavcodec/sbcenc.c b/libavcodec/sbcenc.c index 5f9a214a1a..45156277b7 100644 --- 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" diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 5937f0d56c..87464808a4 100644 --- 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" diff --git a/libavcodec/tak.c b/libavcodec/tak.c index 8aa956b661..7221a80094 100644 --- 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" diff --git a/libavcodec/tta.c b/libavcodec/tta.c index f628071ba3..d9ff45fad6 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -29,6 +29,7 @@ #include +#include "libavutil/channel_layout.h" #include "libavutil/crc.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 342709353f..0b12ae2930 100644 --- 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" diff --git a/libavcodec/wavpackenc.c b/libavcodec/wavpackenc.c index bd548a5c30..dc4f4e303b 100644 --- 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" diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index bad3760159..5f46c97596 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -28,6 +28,7 @@ #import #include +#include "libavutil/channel_layout.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" #include "libavutil/avstring.h" diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c index bfd7be4f37..4ff425d33f 100644 --- a/libavdevice/pulse_audio_enc.c +++ b/libavdevice/pulse_audio_enc.c @@ -23,6 +23,7 @@ #include #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" diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c index 26d61d4c0f..309eb3dd2e 100644 --- a/libavfilter/af_afir.c +++ b/libavfilter/af_afir.c @@ -26,6 +26,7 @@ #include #include "libavutil/avstring.h" +#include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/float_dsp.h" #include "libavutil/intreadwrite.h" diff --git a/libavfilter/af_apulsator.c b/libavfilter/af_apulsator.c index 6be61eb905..56ff4579d6 100644 --- 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" diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c index c477906f87..0baf5541fd 100644 --- 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" diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c index c0b7b1aa4d..a4de76ee0f 100644 --- 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" diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c index badac0cce6..144c0d31ed 100644 --- 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" diff --git a/libavfilter/af_speechnorm.c b/libavfilter/af_speechnorm.c index a2b51a1bd8..d044177352 100644 --- a/libavfilter/af_speechnorm.c +++ b/libavfilter/af_speechnorm.c @@ -28,6 +28,7 @@ #include #include "libavutil/avassert.h" +#include "libavutil/channel_layout.h" #include "libavutil/opt.h" #define FF_BUFQUEUE_SIZE (1024) diff --git a/libavfilter/asrc_afirsrc.c b/libavfilter/asrc_afirsrc.c index 4002118d6a..0ede722ba1 100644 --- 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" diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c index 286334acc8..0aab14b58f 100644 --- 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" diff --git a/libavfilter/asrc_hilbert.c b/libavfilter/asrc_hilbert.c index 64e566084c..e7d596ee46 100644 --- 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" diff --git a/libavfilter/asrc_sinc.c b/libavfilter/asrc_sinc.c index e4aa51c0d0..5397d89c77 100644 --- 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" diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c index 996a6f63c5..37589dd151 100644 --- 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" diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 54f6738f9a..92b092fac6 100644 --- 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" diff --git a/libavfilter/tests/formats.c b/libavfilter/tests/formats.c index ee497f3b90..c1e30e73ee 100644 --- 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 diff --git a/libavformat/alp.c b/libavformat/alp.c index bc19f02083..0d74e73c0b 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 6ae53b8712..d5499f1d90 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 c3ac49fdc2..23e1437209 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 73db777199..60bc598eb4 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 ce249d4470..271d2dc703 100644 --- a/libavformat/codec2.c +++ b/libavformat/codec2.c @@ -21,6 +21,7 @@ #include #include "libavcodec/codec2utils.h" +#include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avio_internal.h" #include "avformat.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 94dc1ddc04..04e9ec813e 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 628b0939dc..ebf1839572 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 04f3e94158..7562b2e24d 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 178e71d891..7e88367938 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 9455a575b7..41c883dafe 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 #include #include +#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 169a96c71f..1ce9cb0b61 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" diff --git a/libswresample/options.c b/libswresample/options.c index 00d4f7c1c9..6911709157 100644 --- 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" diff --git a/libswresample/swresample_frame.c b/libswresample/swresample_frame.c index 2853266d6c..d95c1cc537 100644 --- 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" diff --git a/tests/api/api-flac-test.c b/tests/api/api-flac-test.c index 88b15e8722..b4f52b191f 100644 --- 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"