From patchwork Wed Sep 21 01:35:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38126 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2315093pzh; Tue, 20 Sep 2022 18:36:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6855BtGHPf7F/4LVE84ZgVsrrMHVo2YORFStieQhi+c6IfbtOhB3D1o2wGWB6diGveSxTD X-Received: by 2002:a17:907:2c4f:b0:77d:f3eb:f079 with SMTP id hf15-20020a1709072c4f00b0077df3ebf079mr18636572ejc.356.1663724171508; Tue, 20 Sep 2022 18:36:11 -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 qf28-20020a1709077f1c00b00782035a06b4si1277694ejc.200.2022.09.20.18.36.11; Tue, 20 Sep 2022 18:36:11 -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=a5n5Y4xH; 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 1728268BB47; Wed, 21 Sep 2022 04:36:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073069.outbound.protection.outlook.com [40.92.73.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9710068BB3E for ; Wed, 21 Sep 2022 04:35:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n77J7VZsMIxJuelb/iE9tUq8QtHcUAIvClD9Jr3ymFuQ6oPDfQbi3IB8egqltvgFiF8pQzXRvwVQqaisDRdf+q/OlE6WQnor1Mo/qThUg09WBGA5hdg8E16MNo2HjnBjfBrcn41pMGlN4xS3VHxcCKuyeSsV373DwcdKGfC+o61h/MHnEsdQSktvyOXiQfqpsouRpHpSnVnMrQ4ylsyYn2MEGHTTjFa1ImX0FTmBX3JqSuCjI0BjYdNaSp5P+x1DqRqFhvmBODxNkd9Alx7H8tVHFHyLfllITY866PQvTbBDIGNPcj7PFDI2cknetuLVkP/GdN0Kp35NRYTrKv5ExA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QFh9hPMAV+vtYx1qi+0w96s0Zu+Y7/CMjHLZiCDochc=; b=axW7r+klswNtKOF/Oc16Kh9Qt+ur6Q8OqQoitc84fT/LyFtzbzeR4SnHmmzeUowtsOaqJx+ZnZi/2RLRJSuSZcqqOx38gIcLb1agpvL8WeQFvXwtv+TJMqgdfML4j6MwMNhRXNYAUQl0EzwCpvbhtgycFfUxCTw7YPDucsGZkyjm3dGaz6Oet2KMEYAm2OiyPSCMU47CFYZrukQXX0w9eTFDuRx2KCHiklg35CyxogZaQaXusuBEf7C8WPYYGDyzv/yHo3IrDQ4zq2tdt73oD1mayzHg7KLFlg97U2EfX0KDMs/l4jkCrkCyR8vFv6IqgVcR3eKsHFr0ZgKJM3bcSA== 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=QFh9hPMAV+vtYx1qi+0w96s0Zu+Y7/CMjHLZiCDochc=; b=a5n5Y4xHenryhKuaJD1UBrOdWmHXhjYGmcGq2rE3cAXXM2aYp9J2n0MoWccPagY6cv1Olb8BPNFynLY4HYSd0PIpmku5NfhDIhrRSg53+q0XT2X1Tvw+ieZ6G56LI0iVJCJdAe8y6DCzqQp1gOhXT4E0WJCqtHJzyPRaqYO/2qWC96h2IFoR6FmWvZW+XG69yn7UnOxNLUVyjaBYSFZSWrkad4diOggOi5mIo7NizgErYBiN4I/qzswo0ZZG6tMjrsZIWC/rs0+JFkw4fTM9mxiIz8FKEoZKtfnd1Xo5kdYrBYmFzzzY5J5ktlTB+omwHboqpQedyqkpsl3R1lOFYQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0206.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:277::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.16; Wed, 21 Sep 2022 01:35:48 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Wed, 21 Sep 2022 01:35:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Sep 2022 03:35:41 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [EpodOaa3GHL5K1TjMRI0xZjEFzhHte1ZGLqi2i6+ojI=] X-ClientProxiedBy: ZR2P278CA0044.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220921013541.245789-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0206:EE_ X-MS-Office365-Filtering-Correlation-Id: 67c4805b-5dee-4e2f-4e5c-08da9b719c28 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrSLXKEIOho5rOHknB/H9spjq4GmqRl1LW+ya904c8kigYvwVZNumS4Q7d+hZB6oSbRDhAuLnsjUbY5OxkQTDQGld32vg08Izlx3ep8wRoRzcqAv0HneuUREQVqGArlXOHxp9XcnsnDFOY+zj7J0tH/ZwEGkxc0faHKGAdqIzX5IHXnMGiTcqkZOD/3FaPJAHqVrEW2BGRXSFqJH7lb0vNChapaFABEtqsQgvOIj4lPgVcEEXWldLE/TYXynFqo54e/iNh2WEYX17sEsx1PJvlVA1rENtHoltTFSZtWsbJ04KM87BUHV3LYnwvwmNsmqhqRXSR/UKX9JWibqlYp5cBfwClLwwr/iGJ2aN6s2PM9PpomNLvVM3NXrHfcjGXSVVivKE6s99PnV92nj5MVJK6+Y3u1IB8e4RmqyXd+E2J/1CNXFfTvvjMVXnYeiREi4wicQ5AQs3vs/yK0HovTJiPpV2/fGp2CXV9HhwI1reNL66jHMf6oq87st3LgY1H3gEDidewq/U1XmIPNKc0J6ouR+OkefABYJcvsP+Fd/Iar6kTyWroPqBXgCkZjIvoRz4sjkhaMwy1B4DEKYkSvrUibeKxv2qmo/Ww6E5VAAakax2aOdneyZzxb+GdDlIMDzHEBgFlYHavmV6sylMFcUUY+FIxm0la5Grp3O5TtRH/NX918Z6LO9wYKw4154QnbyE0pwaAtBdQmD6Z4oixL9+hsvl8uTpVzul3BL+i9s+ZVkEVx747RApqnCbeg6TPPHB8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cFGU84BFtMd6rhTMN49zhvg1rGwLm0Jegp8DKOm3uNbKE5UuPkRb71ZV6zqjJJIQ96EfvqMwaOeMh6yi4lxDz4xO8crsWCp4Urjwzg2G0BLSgkN0R2xnmN9hLQtfPmTO6QTR4YNMstbvXy9s1SxsDzIlS4ufhdK3n51c580cyWosq0IlCFGpv0tW/RamFT0KUuEeqJt109HXq2k6YQkwYCfLvbTpw8JgB56XbER2REfozoohp3l3AYQU8aJepzvz1nEHyMqhrxCN9DwiSfRKjzQxzy7D70w3FVAiGymIiXo/KlxQOUZAABxaEhhESWq7BwMnKwbxPaHYHPt6kC9v4iKWT1m6/8rfem4LbAV/stiAw3PA1yUYoF0fKg7yQqa9T983hJgnsDP2X4AEuWSI505FqD+otgpdHKpMin68TbWUqfEnEUeDXOhy0iFoRpkY9KjXnL03+B7373gjaMqd31i2sLaDTvqZHS9M3AADZmEV8xLp6pyEjykwy5KiWjQ9YlQGKclgA0jPAFK/6hG10go3bc3UpHr/9TdaS6e4+iXsege9HkRFznCTtv5b+P6M8scbOcRvIZy8sDumbQ5yIgFQHCwLbUrsX5RJTTIp14ZoOCFYldxp7L3eLQHyTOzWY/0QjP48Un/mIL9Hz4KGAw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LpODCmXx94DD76n5SHmvYcC1qXY1bXT5WPjChj6Fi9Dj78ewqyBLECDd2dF9As3lrvG7muP9tafrQMMilNF0cKUEkXziX5g0WIoa/Lifm7GC3SxMrgv6qy+VE75Y/wmlfC/FR7o34qaDqpULioc//8OrP/PELpjGYSEJZRvYrl0qLuVGozlohzdnNS/m4NnzAVPT+qk03K6+Qfux/5IeI98aA7L3fcHX2TYgEI2gtcp+EbX8aSTxxzw8slWV9g/t/DKofPq3zDWIcbdCb/mK15b6MhFJOWjqQe3DxDbb/NNX0qWfkrQEPxczG4rTftIFVPrOuN/d1n0b3nP0K5GHlmCrwW16947RaBTq77m0igpL38OmNaRMaJsnIHdJBhA8vZ5l3JRdkECrMc/bjrIsVU6fRk+Kby4bIbF0QKG+LVTh5VmlKJC3giguQpq2DIKXr46A3XZSHYxjJqd9jz7pTy/uLAMp9g1nCuSjRfh1LLUgjKT1VauJ+A1MFmlHlz+GorSuyvpeXvFIogCpQVh5OdDGo6dsNHZ0jTXdhhLbMeBWOGBwOOUhrIkoxPFhKpS79mFPUuj0Tqq2ASJguB1W4oWeHL8Zdxlqsw64sn7/p1FAKxFUPQ/KTqPfQBlGRgvDVfkiJyVrF5YVSDbzJCThV6oftvxOUwJICxg4/3S8fUXw/0Q7smeGddVc38SfhAxMmhjy9Tp6CIIJoVKOWoKIN75Sk8jO11KS/voKTCJkCBY74ZINxUxG2DwuNsvoCpR7/ylLmc14axxv412g/NKFVl9A00GRuj7V3KFgWp/hPJDdSdFVZeY58fkSxZQg3DGjhke4YVmwSeM+wNFqefXbG6Thj/NbcteM4dX8KrLqZYUlmLok32suaOs/SKmxc6MWQXfQHDp+qhHasKUjuxQnJx3NszTjmXDejrtcgi1EXVyu//G+nQpd7YWRcGlhfsw2nxT2FN3zyyvIswM6g4mxrLcJgKMUrdkPK1YGdOBTrLys5xrCVZqiVJiZtXSp3Evi77O1jUvIg+tN2P2Og6jrDmw3iqplBQqP4d+2ZXkx0GDpQjGq0W2CUmBMwhtTMCLu+BvHXPtEdgM73qygbTMc0aR2j1lAD241sYecb90/2JvUqLCA6/XFNi5Rc91LpToMLZCF941ASE0EkDQm1f7MTUZZH6uiibygCwLj15mgAzVSaSCCXiwhiisXx3di6evl7iGVEBS8tfonVuQXbUTrCo59TMbqTuHsIUyZwjxHV6d+CucyN5cCYYMLj+sjDAqLWpL+ibJVl26kUd2DD9z0gcInNGd6wXKUzPpHxkmKHEzDY6ksDsd/VARykkYyMn+B X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67c4805b-5dee-4e2f-4e5c-08da9b719c28 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 01:35:48.2165 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P250MB0206 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/internal: Don't include 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: Oj0aj2oGDNDj The general demuxing API uses parsers and decoders. Therefore FFStream contains pointers to AVCodecContexts and AVCodecParserContext and lavf/internal.h includes lavc/avcodec.h. Yet actually only a few files files really use these; and it is best when this number stays small. Therefore this commit uses opaque structs in lavf/internal.h for these contexts and stops including avcodec.h. This also avoids including lavc/codec_desc.h implicitly. All other headers are implicitly included as now (mostly through codec.h). Signed-off-by: Andreas Rheinhardt --- libavdevice/jack.c | 1 - libavdevice/v4l2.c | 1 + libavformat/asfenc.c | 1 + libavformat/av1dec.c | 2 +- libavformat/concatdec.c | 1 + libavformat/dashenc.c | 2 ++ libavformat/demux.c | 1 + libavformat/dump.c | 3 ++- libavformat/flacdec.c | 1 + libavformat/flvenc.c | 1 + libavformat/hlsenc.c | 2 ++ libavformat/internal.h | 3 +-- libavformat/matroskaenc.c | 1 + libavformat/mpegts.c | 1 + libavformat/mpegtsenc.c | 1 + libavformat/mxfenc.c | 1 + libavformat/oggparseflac.c | 1 + libavformat/rawdec.c | 6 ++---- libavformat/riffenc.c | 1 - libavformat/rtsp.c | 1 + libavformat/seek.c | 2 ++ 21 files changed, 24 insertions(+), 10 deletions(-) diff --git a/libavdevice/jack.c b/libavdevice/jack.c index e34eb8961c..db056d824f 100644 --- a/libavdevice/jack.c +++ b/libavdevice/jack.c @@ -29,7 +29,6 @@ #include "libavutil/fifo.h" #include "libavutil/opt.h" #include "libavutil/time.h" -#include "libavcodec/avcodec.h" #include "libavformat/avformat.h" #include "libavformat/internal.h" #include "timefilter.h" diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index be422d7c8c..5e85d1a2b3 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -38,6 +38,7 @@ #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" #include "libavutil/time.h" +#include "libavcodec/avcodec.h" #include "libavcodec/codec_desc.h" #include "libavformat/demux.h" #include "libavformat/internal.h" diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index e1563b1da6..70800a6df5 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -25,6 +25,7 @@ #include "libavutil/dict.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" +#include "libavcodec/codec_desc.h" #include "avformat.h" #include "avlanguage.h" #include "avio_internal.h" diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 350f5360d5..d4b430af7e 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config.h" #include "config_components.h" #include "libavutil/common.h" #include "libavutil/opt.h" +#include "libavcodec/avcodec.h" #include "libavcodec/av1_parse.h" #include "libavcodec/bsf.h" #include "avformat.h" diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index e57da59e04..7748c20b6d 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -25,6 +25,7 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/timestamp.h" +#include "libavcodec/codec_desc.h" #include "libavcodec/bsf.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 295b01e225..a0919f6f2d 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -38,6 +38,8 @@ #include "libavutil/time.h" #include "libavutil/time_internal.h" +#include "libavcodec/avcodec.h" + #include "av1.h" #include "avc.h" #include "avformat.h" diff --git a/libavformat/demux.c b/libavformat/demux.c index 1620716716..2dfd82a63c 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -34,6 +34,7 @@ #include "libavutil/time.h" #include "libavutil/timestamp.h" +#include "libavcodec/avcodec.h" #include "libavcodec/bsf.h" #include "libavcodec/internal.h" #include "libavcodec/packet_internal.h" diff --git a/libavformat/dump.c b/libavformat/dump.c index cafcef36c6..225f80ac22 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -30,12 +30,13 @@ #include "libavutil/dovi_meta.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" -#include "libavutil/avstring.h" #include "libavutil/replaygain.h" #include "libavutil/spherical.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" +#include "libavcodec/avcodec.h" + #include "avformat.h" #include "internal.h" diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index eadd41fc36..b58ec03963 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -20,6 +20,7 @@ */ #include "libavutil/channel_layout.h" +#include "libavcodec/avcodec.h" #include "libavcodec/bytestream.h" #include "libavcodec/flac.h" #include "avformat.h" diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 5d574fa790..59be11eba8 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -24,6 +24,7 @@ #include "libavutil/intfloat.h" #include "libavutil/avassert.h" #include "libavutil/mathematics.h" +#include "libavcodec/codec_desc.h" #include "libavcodec/mpeg4audio.h" #include "avio.h" #include "avc.h" diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 6f49ae1aa2..a86fc8907f 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -43,6 +43,8 @@ #include "libavutil/time.h" #include "libavutil/time_internal.h" +#include "libavcodec/avcodec.h" + #include "avformat.h" #include "avio_internal.h" #include "avc.h" diff --git a/libavformat/internal.h b/libavformat/internal.h index 23757dc4fc..ce837fefc7 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -23,7 +23,6 @@ #include -#include "libavcodec/avcodec.h" #include "libavcodec/packet_internal.h" #include "avformat.h" @@ -221,7 +220,7 @@ typedef struct FFStream { /** * The codec context used by avformat_find_stream_info, the parser, etc. */ - AVCodecContext *avctx; + struct AVCodecContext *avctx; /** * 1 if avctx has been initialized with the values from the codec parameters */ diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 147f29988e..2be4f87284 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -58,6 +58,7 @@ #include "libavutil/stereo3d.h" #include "libavcodec/av1.h" +#include "libavcodec/codec_desc.h" #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 8a3436f2be..d97702fcd7 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -32,6 +32,7 @@ #include "libavutil/opt.h" #include "libavutil/avassert.h" #include "libavutil/dovi_meta.h" +#include "libavcodec/avcodec.h" #include "libavcodec/bytestream.h" #include "libavcodec/get_bits.h" #include "libavcodec/opus.h" diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index c964d58c8e..5148a6aecd 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -28,6 +28,7 @@ #include "libavutil/opt.h" #include "libavcodec/ac3_parser_internal.h" +#include "libavcodec/avcodec.h" #include "libavcodec/startcode.h" #include "avformat.h" diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 9a9acbfa08..58c551c83c 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -47,6 +47,7 @@ #include "libavutil/mastering_display_metadata.h" #include "libavutil/pixdesc.h" #include "libavutil/time_internal.h" +#include "libavcodec/avcodec.h" #include "libavcodec/golomb.h" #include "libavcodec/h264.h" #include "libavcodec/packet_internal.h" diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index fa7459c162..eef6e09927 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -19,6 +19,7 @@ */ #include +#include "libavcodec/avcodec.h" #include "libavcodec/get_bits.h" #include "libavcodec/flac.h" #include "avformat.h" diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 17649bc077..de804366ed 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -24,12 +24,10 @@ #include "avformat.h" #include "internal.h" -#include "avio_internal.h" #include "rawdec.h" #include "libavutil/opt.h" -#include "libavutil/parseutils.h" -#include "libavutil/pixdesc.h" -#include "libavutil/intreadwrite.h" + +#include "libavcodec/avcodec.h" #define RAW_PACKET_SIZE 1024 diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index 7825c4e746..179b0f12cb 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -23,7 +23,6 @@ #include "libavutil/dict.h" #include "libavutil/log.h" #include "libavutil/mathematics.h" -#include "libavcodec/avcodec.h" #include "libavcodec/bytestream.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index f948f1d395..cfafb4be80 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -32,6 +32,7 @@ #include "libavutil/dict.h" #include "libavutil/opt.h" #include "libavutil/time.h" +#include "libavcodec/codec_desc.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/seek.c b/libavformat/seek.c index 3b1c75f1b1..a236e285c0 100644 --- a/libavformat/seek.c +++ b/libavformat/seek.c @@ -25,6 +25,8 @@ #include "libavutil/mathematics.h" #include "libavutil/timestamp.h" +#include "libavcodec/avcodec.h" + #include "avformat.h" #include "avio_internal.h" #include "demux.h"