From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E6D26473B0 for ; Wed, 6 Sep 2023 09:35:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2EECE68C7A1; Wed, 6 Sep 2023 12:35:09 +0300 (EEST) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2020.outbound.protection.outlook.com [40.92.59.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D222068AB90 for ; Wed, 6 Sep 2023 12:35:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hFkI+EJz2Pl5C8ZZHccUj6S0KjP7KWOAUXxbqMXbkgTnhmjRdZA4zC6h/StL/t/KXjMc6k9/LBWBr5j99cNKkmlR/WuzqmI3rEgFkrxQnuHgofj1R1dkCqvGie8l7oPASKWmnks+YinarDpi1dqnAm3QzvrcDIHIam7M1SEFk0SNexKUtJmNIM1645fePUNix5aP83cXieu8sY/CALnQcpLJmgi9otGlRXfS0vQOMS4pc430fTOWnLEYNTJ5qVRGD+Qxl/hu38dEUkU/XVWDPg04BUgcVW/elum4IisZ4TWtPZ+a3DSVklBdbLCZv7hzPNFB2luv3QIvleSkwArkUQ== 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=JFF551GTOo3Xi9hagubphFezyE/5mwbvAiczlQJBWLw=; b=PpNpcl74UvzfZpeYg6yD/OauYmYiWeqGk0FvkVdqHNxq3vrhkA7Ylkk/9UN7FlTayhPGcja/C047E4Zc32jG2Q9NHvzHkNMfoBzet/FCy5FMOMO2N9NsopcH2/DC3LzhbQoBDOB0HW+JB3ONiobP+WljnERQrXC4KZLchomo2EWKh69Tqt2V1QxEaYEFlQeHeyzRQ4vpIcwsgo824YtK5TEgrISF8MVZLvZcuIIYSQsKCZxCSiLmdD10x92Gfs8I1t2C7oJkIK+LIDlG97bCUVha62RobtqKY9uM96ZZLKOdCqCHcv/bpuCM5rYCmnC32H9HYPMKOndM+y59bGTSsA== 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=JFF551GTOo3Xi9hagubphFezyE/5mwbvAiczlQJBWLw=; b=gkMtIOsRcMGBCX4uNwpomoQqW7qBmuqP9eQ1sAMvk+XX3GfqrpqFvLtzbOzHdwW5GagFC6/iOTT94nsimCjq1tmyFhMSZITBFWk/6Wx47I6Wd4+I6sVjtO2JYMSUgIidtqWYsZRCAYA2cLF0psL2Fk6fUM2jdUpwjj0Hd6Esg0SwStUhel73kyXeOh7FrAL3kPTsJz/8MqFasczR36CVbBfo2I6K70ZGm4f5oyS3lCdxSEsaNqL46N5kG8xQvC5fVEEsGos1zDrt+iIffi2ijbAeEiHPcAdu09TkzzmjEJJbuJky46/ZBsVVTWZI+V/6db3oXsc8U4w7xxY00YA5Yg== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by AS8P250MB0284.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.34; Wed, 6 Sep 2023 09:35:01 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::e8dd:7fe1:2348:cd62]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::e8dd:7fe1:2348:cd62%7]) with mapi id 15.20.6745.030; Wed, 6 Sep 2023 09:35:00 +0000 Message-ID: Date: Wed, 6 Sep 2023 11:36:19 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [HrsUgSFtySOX4be1UI+5FBnLqgyg38k+] X-ClientProxiedBy: FR0P281CA0121.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::19) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <3ed51c46-96d1-1332-de9d-b8485801a228@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|AS8P250MB0284:EE_ X-MS-Office365-Filtering-Correlation-Id: 2faa6e3f-05ac-48b3-b687-08dbaebc8aaa X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aDhPhh0oMcSX7EVSYyeLCE9ZmGv2Qczp2Lq7C9QSELzD5Tl8JFAnLQFWScRIslogWAaWGb0xUNivyttmx8nN0cpY7UZP79eUTcqVsh1yFHyYUnaiO8WcYZbJmcw6P+hT+Xbu432k3JnUVXE5Ul5a56xOPCiR5k+2pzg9dj9iWgyvEEHcOtj4NFttTB6wSXfmOf04m2bz5lSnkzyEEzaAiOtCZLhruTTIr5RfB6vZ0Fu0ODxuafIf3jgpy0+sopLBML5BUG05HxTxPoz68ca85msH/YAU1GQpERCXTKfm4AqidO5haJB8CArEZrNvJMQGIYKAUbOm0wuhpTAA5H8dpNIyfXOUuHKUTaUBF2cRTdl26ueJohM1+mW//Xlg35+9TFL9ReScws57RrnAUTgZEFPlCfATOEL/nr1I0l3qze3CMY4uuDrd1E3DUsiIkems3YlSL9OO2BuKtWjCMmOnFLg2yyGNMHZmdgqSnbW8nUZrLCuWfustHIRyi/3kcr8J+K3Tu7J1XDrWdBAW7ff8VSMK21oaw7wSyortaH0AU/Po2+RSVPYF+I+Dvvc0ceDv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VGdjWXFvTzJHY3NnRXd6c2ZhOWhuQk9IVTJVKy9FTUhHMFFzWlhwcEltMll6?= =?utf-8?B?a2JpOGhhbnJqeTBENEN0UVcveVhQUzd3Z2Z3cXI3MlFQNWswRXJCTmNndXZS?= =?utf-8?B?cldrUlVCMzJEUDEvaHNlQjJvSUtSUTZmMnh4d2xreFhGYXdJa0FEWlIxa2pI?= =?utf-8?B?NjRRU3I3eVdXdG5nMy94dXBjN3ByZUhvMWNuNzNxMVg4aHcvdVZzZ0s2Y1Fr?= =?utf-8?B?QW00bkRvOERDUk5UZGhBRHcvY3BSVFdKUm11SnV4dWZOM1AvWU5YWExWYml5?= =?utf-8?B?bVRac3ppbTgvQ24yZndRa3BKOHU3WThsVUplV2xaWGVCWStFcVdzTHNSUGhE?= =?utf-8?B?Q2RFSXRHQWowMXA2SWRiWVB4M1FZajM4amVWTVZLYllYMkkvSzQwT0ZjcFZE?= =?utf-8?B?WkRHSVNVSWZJeFVUTmZMRWwvUm5hSzVvTlQ0blA5Slh5YnRUaE1XNjBZWEdE?= =?utf-8?B?akVLQlU3ZnlYa2kwSi9tQklQaXFzZ0o1Y0l1d1pCZkpsdXpDZDJCQmdjWFlk?= =?utf-8?B?aVVNTnFsblhYdngrOGEzTmo5d1NDbVZ0TC9ZZHAveE4zcUZuNGdyMXFoSXpU?= =?utf-8?B?LzBtdzhrcDVJR3pJeENtbUNhRHFLaWR3ZXpTQ0QxWUxWNVVTaTdYbXk4T0R1?= =?utf-8?B?SG1PaFFtbHBvQitnTTYvcDU2N0JFWnBoamxsVDV3RkNzYXhJY2ZSTnhzUi9V?= =?utf-8?B?UHkzbk5WYmJoU2hWclN4emZINkdkRGxxSm85NTJ5WVBCOTB5eGN6YnllVDBl?= =?utf-8?B?THY4cnlscGRMU1VvcnVUcngwd1p6RjE4NEttKzNsQ3VsdzZBa3BpS3dQOTBj?= =?utf-8?B?aHhiYmd3dnJXQjZVMFRaTkNqcWI2Sm1NNHdWbElOZFlaNXhQOXdGcmV4RFBF?= =?utf-8?B?YlpPc3AyVGhiOVFUdzM2VWRvQWE3ZGI4bnpZNFJ2cWNWSTRJUDFwQ2VwaSt4?= =?utf-8?B?ZEZhcmVXZU5EL1BERGRkMVBKM3p1aUpkU0pnay9pajJISERqSkdpaUR0ZURx?= =?utf-8?B?TFQ3cnpjalBMWVNrcGdLcytFWGN2dGxpZ2J2YkFGNERQMVlWNUcrRThqVHln?= =?utf-8?B?c05pR250eEFmSG9aWFdjcERDbWNKY2lmNTJLeHVIMXl0ODdZM3NVNFVmRURl?= =?utf-8?B?cVZneU5DeEQvWTBZS2R4Q3poaVVOTnlkRG1QWnM3OUVyUlp3TDNOeGFiYlJG?= =?utf-8?B?eHRhRk9GWlpJRHR1dWpkT0p1SVI3b3ZDcUtoUThHb0ZDTnhOakFNdEFmdld3?= =?utf-8?B?MEp6aU5tMmh5TmxGZ0dURkswcUo3bUpxYUt0RmE5clhQNkVpSWZjMFJjemdQ?= =?utf-8?B?NzQzNmpXSFQ5UjR2OFBWS0Vwcmd4QmhpNDVkK2hMUFdGWXFWYTZHQXEvZDAy?= =?utf-8?B?aW43eWdiSkp2MEhVR3BjWFptUGI0U2hEOHRzZmd4TEphaUFsUTBvMkF4Ymdr?= =?utf-8?B?UmN1cjV2YXV3T2ZEbmI4bjBoQU41SnM4bXhuNXhQZHBocmZxNk41TGtjaDh3?= =?utf-8?B?UFlyT2hiUDlhcjBxVlNCTXBaYXdwWmN2NDdkNGprRS93YnArVjZBQU1YTVRx?= =?utf-8?B?dHlWNXNEUVEzeGpxUGw1TEduWTlZamtQcVNIUGdqd0NLTHkxUXdud0o4T0w2?= =?utf-8?B?SW9VeHQ5M29kQ1llRC9xd2t5OG5MVWtIcVFNWjB4eUZERDhqZjRRbjYxVkNt?= =?utf-8?Q?XOBcybuODFfJJp/13lHL?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2faa6e3f-05ac-48b3-b687-08dbaebc8aaa X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2023 09:35:00.9198 (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: AS8P250MB0284 Subject: Re: [FFmpeg-devel] [PATCH] avformat/avformat: Avoid including codec.h, frame.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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > AVCodec is only ever used as an incomplete type (i.e. via a pointer > to an AVCodec) in avformat.h and it is not really part of the core > of avformat.h or libavformat; almost none of our internal users > make use of it (and none make use of hwcontext.h, which is implicitly > included). So switch to use struct AVCodec, but continue to include > codec.h for external users for compatibility. > > Also, do the same for AVFrame and frame.h, which is implicitly included > by codec.h (via lavu/hwcontext.h). > > Also, remove an unnecessary inclusion of . > > Signed-off-by: Andreas Rheinhardt > --- > libavdevice/alsa_enc.c | 1 + > libavdevice/opengl_enc.c | 1 + > libavdevice/pulse_audio_enc.c | 1 + > libavdevice/xv.c | 1 + > libavformat/asfdec_o.c | 2 ++ > libavformat/avformat.c | 2 ++ > libavformat/avformat.h | 29 ++++++++++++++++------------- > libavformat/dashdec.c | 1 + > libavformat/dashenc.c | 1 + > libavformat/dhav.c | 2 ++ > libavformat/ftp.c | 1 + > libavformat/hlsenc.c | 1 + > libavformat/hlsplaylist.c | 1 + > libavformat/http.c | 1 + > libavformat/img2enc.c | 2 ++ > libavformat/internal.h | 4 ++-- > libavformat/mlvdec.c | 2 ++ > libavformat/mux.c | 2 ++ > libavformat/mux.h | 2 +- > libavformat/mxfdec.c | 1 + > libavformat/uncodedframecrcenc.c | 1 + > libavformat/wavenc.c | 1 + > libavformat/webmdashenc.c | 1 + > libavformat/wtvdec.c | 1 + > libavformat/yuv4mpegenc.c | 1 + > 25 files changed, 47 insertions(+), 16 deletions(-) > > diff --git a/libavdevice/alsa_enc.c b/libavdevice/alsa_enc.c > index 62a20c7ba4..4c7805065e 100644 > --- a/libavdevice/alsa_enc.c > +++ b/libavdevice/alsa_enc.c > @@ -39,6 +39,7 @@ > > #include > > +#include "libavutil/frame.h" > #include "libavutil/internal.h" > #include "libavutil/time.h" > > diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c > index 1b0cf5aa8f..80feda7072 100644 > --- a/libavdevice/opengl_enc.c > +++ b/libavdevice/opengl_enc.c > @@ -49,6 +49,7 @@ > #endif > > #include "libavutil/common.h" > +#include "libavutil/frame.h" > #include "libavutil/pixdesc.h" > #include "libavutil/log.h" > #include "libavutil/opt.h" > diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c > index 3d8323233f..9e594c6424 100644 > --- a/libavdevice/pulse_audio_enc.c > +++ b/libavdevice/pulse_audio_enc.c > @@ -26,6 +26,7 @@ > #include "libavformat/mux.h" > #include "libavformat/version.h" > #include "libavutil/channel_layout.h" > +#include "libavutil/frame.h" > #include "libavutil/internal.h" > #include "libavutil/opt.h" > #include "libavutil/time.h" > diff --git a/libavdevice/xv.c b/libavdevice/xv.c > index 441f854121..b3d79d57a8 100644 > --- a/libavdevice/xv.c > +++ b/libavdevice/xv.c > @@ -32,6 +32,7 @@ > #include > #include > > +#include "libavutil/frame.h" > #include "libavutil/opt.h" > #include "libavutil/pixdesc.h" > #include "libavutil/imgutils.h" > diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c > index 2b407c016f..10942ecfa0 100644 > --- a/libavformat/asfdec_o.c > +++ b/libavformat/asfdec_o.c > @@ -19,6 +19,8 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > */ > > +#include > + > #include "libavutil/attributes.h" > #include "libavutil/common.h" > #include "libavutil/dict.h" > diff --git a/libavformat/avformat.c b/libavformat/avformat.c > index 356b4de931..7ff0cf3429 100644 > --- a/libavformat/avformat.c > +++ b/libavformat/avformat.c > @@ -23,12 +23,14 @@ > #include "libavutil/avassert.h" > #include "libavutil/avstring.h" > #include "libavutil/channel_layout.h" > +#include "libavutil/frame.h" > #include "libavutil/intreadwrite.h" > #include "libavutil/mem.h" > #include "libavutil/opt.h" > #include "libavutil/pixfmt.h" > #include "libavutil/samplefmt.h" > #include "libavcodec/avcodec.h" > +#include "libavcodec/codec.h" > #include "libavcodec/bsf.h" > #include "libavcodec/codec_desc.h" > #include "libavcodec/packet_internal.h" > diff --git a/libavformat/avformat.h b/libavformat/avformat.h > index 1916aa2dc5..10ee3c87c6 100644 > --- a/libavformat/avformat.h > +++ b/libavformat/avformat.h > @@ -307,10 +307,8 @@ > * @} > */ > > -#include > #include /* FILE */ > > -#include "libavcodec/codec.h" > #include "libavcodec/codec_par.h" > #include "libavcodec/defs.h" > #include "libavcodec/packet.h" > @@ -325,10 +323,13 @@ > * to avoid unnecessary rebuilds. When included externally, keep including > * the full version information. */ > #include "libavformat/version.h" > + > +#include "libavutil/frame.h" > +#include "libavcodec/codec.h" > #endif > > struct AVFormatContext; > - > +struct AVFrame; > struct AVDeviceInfoList; > > /** > @@ -1569,7 +1570,7 @@ typedef struct AVFormatContext { > * the same codec_id. > * Demuxing: Set by user > */ > - const AVCodec *video_codec; > + const struct AVCodec *video_codec; > > /** > * Forced audio codec. > @@ -1577,7 +1578,7 @@ typedef struct AVFormatContext { > * the same codec_id. > * Demuxing: Set by user > */ > - const AVCodec *audio_codec; > + const struct AVCodec *audio_codec; > > /** > * Forced subtitle codec. > @@ -1585,7 +1586,7 @@ typedef struct AVFormatContext { > * the same codec_id. > * Demuxing: Set by user > */ > - const AVCodec *subtitle_codec; > + const struct AVCodec *subtitle_codec; > > /** > * Forced data codec. > @@ -1593,7 +1594,7 @@ typedef struct AVFormatContext { > * the same codec_id. > * Demuxing: Set by user > */ > - const AVCodec *data_codec; > + const struct AVCodec *data_codec; > > /** > * Number of bytes to be written as padding in a metadata header. > @@ -1842,7 +1843,7 @@ const AVClass *av_stream_get_class(void); > * > * @return newly created stream or NULL on error. > */ > -AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c); > +AVStream *avformat_new_stream(AVFormatContext *s, const struct AVCodec *c); > > /** > * Wrap an existing array as stream side data. > @@ -2076,7 +2077,7 @@ int av_find_best_stream(AVFormatContext *ic, > enum AVMediaType type, > int wanted_stream_nb, > int related_stream, > - const AVCodec **decoder_ret, > + const struct AVCodec **decoder_ret, > int flags); > > /** > @@ -2352,7 +2353,7 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt); > * See av_interleaved_write_uncoded_frame() for details. > */ > int av_write_uncoded_frame(AVFormatContext *s, int stream_index, > - AVFrame *frame); > + struct AVFrame *frame); > > /** > * Write an uncoded frame to an output media file. > @@ -2371,7 +2372,7 @@ int av_write_uncoded_frame(AVFormatContext *s, int stream_index, > * @return >=0 for success, a negative code on error > */ > int av_interleaved_write_uncoded_frame(AVFormatContext *s, int stream_index, > - AVFrame *frame); > + struct AVFrame *frame); > > /** > * Test whether a muxer supports uncoded frame. > @@ -2759,7 +2760,8 @@ const struct AVCodecTag *avformat_get_mov_audio_tags(void); > * @param frame the frame with the aspect ratio to be determined > * @return the guessed (valid) sample_aspect_ratio, 0/1 if no idea > */ > -AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame); > +AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, > + struct AVFrame *frame); > > /** > * Guess the frame rate, based on both the container and codec information. > @@ -2769,7 +2771,8 @@ AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *strea > * @param frame the frame for which the frame rate should be determined, may be NULL > * @return the guessed (valid) frame rate, 0/1 if no idea > */ > -AVRational av_guess_frame_rate(AVFormatContext *ctx, AVStream *stream, AVFrame *frame); > +AVRational av_guess_frame_rate(AVFormatContext *ctx, AVStream *stream, > + struct AVFrame *frame); > > /** > * Check if the stream st contained in s is matched by the stream specifier > diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c > index 29d4680c68..f4af625814 100644 > --- a/libavformat/dashdec.c > +++ b/libavformat/dashdec.c > @@ -20,6 +20,7 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > */ > #include > +#include > #include "libavutil/bprint.h" > #include "libavutil/opt.h" > #include "libavutil/time.h" > diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c > index 17fe5f430c..69ceae2cbf 100644 > --- a/libavformat/dashenc.c > +++ b/libavformat/dashenc.c > @@ -22,6 +22,7 @@ > > #include "config.h" > #include "config_components.h" > +#include > #if HAVE_UNISTD_H > #include > #endif > diff --git a/libavformat/dhav.c b/libavformat/dhav.c > index 4e720f2a26..2ec4857f29 100644 > --- a/libavformat/dhav.c > +++ b/libavformat/dhav.c > @@ -20,6 +20,8 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > */ > > +#include > + > #include "libavutil/parseutils.h" > #include "avio_internal.h" > #include "avformat.h" > diff --git a/libavformat/ftp.c b/libavformat/ftp.c > index 883668b37b..f9b069a59e 100644 > --- a/libavformat/ftp.c > +++ b/libavformat/ftp.c > @@ -19,6 +19,7 @@ > */ > > #include > +#include > > #include "libavutil/avstring.h" > #include "libavutil/internal.h" > diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c > index 27d97f5f72..004bd25359 100644 > --- a/libavformat/hlsenc.c > +++ b/libavformat/hlsenc.c > @@ -23,6 +23,7 @@ > #include "config.h" > #include "config_components.h" > #include > +#include > #if HAVE_UNISTD_H > #include > #endif > diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c > index 0e1dcc087f..2bf05f3c7c 100644 > --- a/libavformat/hlsplaylist.c > +++ b/libavformat/hlsplaylist.c > @@ -22,6 +22,7 @@ > > #include "config.h" > #include > +#include > > #include "libavutil/time_internal.h" > > diff --git a/libavformat/http.c b/libavformat/http.c > index fd931c2d8e..c0fe7c36d9 100644 > --- a/libavformat/http.c > +++ b/libavformat/http.c > @@ -22,6 +22,7 @@ > #include "config.h" > #include "config_components.h" > > +#include > #if CONFIG_ZLIB > #include > #endif /* CONFIG_ZLIB */ > diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c > index 9b8ec06cea..526a11e5ee 100644 > --- a/libavformat/img2enc.c > +++ b/libavformat/img2enc.c > @@ -20,6 +20,8 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > */ > > +#include > + > #include "config_components.h" > > #include "libavutil/intreadwrite.h" > diff --git a/libavformat/internal.h b/libavformat/internal.h > index 53e70ccb53..051e8e2893 100644 > --- a/libavformat/internal.h > +++ b/libavformat/internal.h > @@ -566,8 +566,8 @@ void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf, > > enum AVCodecID ff_guess_image2_codec(const char *filename); > > -const AVCodec *ff_find_decoder(AVFormatContext *s, const AVStream *st, > - enum AVCodecID codec_id); > +const struct AVCodec *ff_find_decoder(AVFormatContext *s, const AVStream *st, > + enum AVCodecID codec_id); > > /** > * Set the time base and wrapping info for a given stream. This will be used > diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c > index db3b77bb9b..b706898cb3 100644 > --- a/libavformat/mlvdec.c > +++ b/libavformat/mlvdec.c > @@ -24,6 +24,8 @@ > * Magic Lantern Video (MLV) demuxer > */ > > +#include > + > #include "libavutil/imgutils.h" > #include "libavutil/intreadwrite.h" > #include "libavutil/rational.h" > diff --git a/libavformat/mux.c b/libavformat/mux.c > index 415bd3948f..fff8094341 100644 > --- a/libavformat/mux.c > +++ b/libavformat/mux.c > @@ -24,12 +24,14 @@ > #include "mux.h" > #include "version.h" > #include "libavcodec/bsf.h" > +#include "libavcodec/codec_desc.h" > #include "libavcodec/internal.h" > #include "libavcodec/packet_internal.h" > #include "libavutil/opt.h" > #include "libavutil/dict.h" > #include "libavutil/timestamp.h" > #include "libavutil/avassert.h" > +#include "libavutil/frame.h" > #include "libavutil/internal.h" > #include "libavutil/mathematics.h" > > diff --git a/libavformat/mux.h b/libavformat/mux.h > index c2de45400c..9de5c2852a 100644 > --- a/libavformat/mux.h > +++ b/libavformat/mux.h > @@ -96,7 +96,7 @@ typedef struct FFOutputFormat { > * by setting the pointer to NULL. > */ > int (*write_uncoded_frame)(AVFormatContext *, int stream_index, > - AVFrame **frame, unsigned flags); > + struct AVFrame **frame, unsigned flags); > /** > * Returns device list with it properties. > * @see avdevice_list_devices() for more details. > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c > index 34230ece98..110b69b7c1 100644 > --- a/libavformat/mxfdec.c > +++ b/libavformat/mxfdec.c > @@ -45,6 +45,7 @@ > */ > > #include > +#include > > #include "libavutil/aes.h" > #include "libavutil/avstring.h" > diff --git a/libavformat/uncodedframecrcenc.c b/libavformat/uncodedframecrcenc.c > index 4c37ef6e5b..529b2f36cb 100644 > --- a/libavformat/uncodedframecrcenc.c > +++ b/libavformat/uncodedframecrcenc.c > @@ -21,6 +21,7 @@ > #include "libavutil/adler32.h" > #include "libavutil/avassert.h" > #include "libavutil/bprint.h" > +#include "libavutil/frame.h" > #include "libavutil/imgutils.h" > #include "libavutil/pixdesc.h" > #include "libavformat/mux.h" > diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c > index c12c090934..82acb9ef0f 100644 > --- a/libavformat/wavenc.c > +++ b/libavformat/wavenc.c > @@ -32,6 +32,7 @@ > > #include > #include > +#include > > #include "libavutil/avstring.h" > #include "libavutil/dict.h" > diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c > index 0d6c4a2072..31ea3c6e8c 100644 > --- a/libavformat/webmdashenc.c > +++ b/libavformat/webmdashenc.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > > #include "avformat.h" > #include "matroska.h" > diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c > index 98128b7201..b29ea7a923 100644 > --- a/libavformat/wtvdec.c > +++ b/libavformat/wtvdec.c > @@ -26,6 +26,7 @@ > */ > > #include > +#include > > #include "libavutil/channel_layout.h" > #include "libavutil/intreadwrite.h" > diff --git a/libavformat/yuv4mpegenc.c b/libavformat/yuv4mpegenc.c > index 968ba2fa13..1d641eb9e4 100644 > --- a/libavformat/yuv4mpegenc.c > +++ b/libavformat/yuv4mpegenc.c > @@ -19,6 +19,7 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > */ > > +#include "libavutil/frame.h" > #include "libavutil/pixdesc.h" > #include "avformat.h" > #include "internal.h" Will apply this patchset tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".