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 4C15F4943C for ; Tue, 12 Mar 2024 08:57:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F76F68CCF9; Tue, 12 Mar 2024 10:56:58 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2053.outbound.protection.outlook.com [40.92.91.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3F3268CCF9 for ; Tue, 12 Mar 2024 10:56:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PSvVvA/gfrLCMCVsVhCHH8eSTN7ZJo3kECQe4P++vXbxOU3s8HeLiGVeiSwcRdTPB8/9MEr431ARrxqLcJXm5Jg/lnfXcV2uRXA7DFnQYG9Z3ioXMPpvbYULf1X680BZSe/VfRcESMoAQdZitdwOVi+E1sChu6JiQIXrF1L8SFH/JrS0XtVEY7+Ud4aHfSk5ChfOSiLInuN6t7oHSCWWC8hJTEu3exHItBfqjRyJkSDFEpXDT3+6dYu3/ACjTxiHfxI6404c2v+2eS/NcAP1RjVadCIZefNaomy3LfjsWfsLNnlasJe8TaDCFOM8IIrkxOjfh9RZPrFIbsyh/iPmhA== 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=P+FGheW5SMgiSdmuzL34qqdc7q5BoWYReTYcXEihfGs=; b=ajPjrFClZ7RBLgK9ri4iO22osrHJXxAvKjHWhqJ16/35TSpLAhipa4VUcwbDy96gbqlbS2Rxr1Kv+Zgfv8NjliNkKUDYADOnz35eorVilE2uM4R3EoDPOcHwIzMBTVhayfTBffrHpbJFxl7fisF6ilRoXOXil5hCPIvm7wEPmMqTFU/U2awElHIEj7O0Zu+KGDV3nwzW5i9us52RshHN1q2yRXAOqUiMTixrwlOW5QVZH+1z9CbBWtqfaD83e8LD6cQukOwysSFIs/Wet21DK1oI9E9rfCSggh4fHQCocTB2R0CFBJUeDREO5lhYK9HtfaDsdSugytmzWhdYfuBQkw== 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=P+FGheW5SMgiSdmuzL34qqdc7q5BoWYReTYcXEihfGs=; b=nfoeR7Y2bX2gLY1bVC93nB5yJOo9A3ZhMHp++TwvgY4SJEWUVTbrdD+vXtZjgzcBMSfqjvbO2vNLmqEt2v0JKoY5OQt5xHqxIsa1HUH3EOZKMhtoXS/uLf97gRv/NSyL2tFm1qZklR8AggP5LaO3S361XinaJT73SzeAIIZh3qcKTYo53/ntDHTj/7SD4VR4DXhpfZ2H3D51ftyRnTy9td5GqzYTrkKioAdT+RHpdHVY7OYB9jPXX/PvGYz8neNREN2b9GUx8LNouCV7P8KLIj4LXNk3tNPJabPmxMrnd9gOFeUduKWfqE0MbqK2QTfoSZXcLkrv++RkC9aobP2N9w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0008.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:35b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Tue, 12 Mar 2024 08:56:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.035; Tue, 12 Mar 2024 08:56:49 +0000 Message-ID: Date: Tue, 12 Mar 2024 09:56:46 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240312084343.18441-1-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20240312084343.18441-1-anton@khirnov.net> X-TMN: [OkiQKgwG5LqxPLOPtRxW81ATgm5KX4+XP540Z/yHfNo=] X-ClientProxiedBy: ZR2P278CA0001.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <044efb76-2d87-424a-96b2-310e57140538@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0008:EE_ X-MS-Office365-Filtering-Correlation-Id: 900c2e4b-b18d-484f-f516-08dc42725a83 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnoAVlBsXi+5fjBAzVXFn6z1TNFD1SeWKyBLO4Uxe03LnFZki/LoowkoMqWouOUfxXjVzrdvCW0wpbag3DdwDfnNwThbaif2EMHO3xqfGOagZ/RH/YeW9ea0jWdZJ4JqB72cmFwUyUiSnnRC7JJHfqCvrS7WC6u8HOpnSWDhEuRSm/kMOdQo9ecN7E8sEOdbB7lxuad1BhPml6xuphz1fzcbSFHYIlcDV766UneKh4gz+uhFZ84oTkAUYgbnke5PZlP+L4ZrFnSTWVO3/CGiicsIEVGqSiU9OytgxRPcLtQ9mnOdwDtSZHObB6VVKGR7g6U8gOWUYj8Y0Nu8jbnK9z9Fs8+WTlD3btUGcOQGR7oaCpZmqqM8nfEtXi6w/74sTQtjk9iNY3M5ByLnjPZpb07NMoqmawN8FPnBgyKTc24H/8wRIJ/obZbFCjP9PjGHzYRKhHTg8KrULOJvI78ajyN4kBwg49uAsrkDOr7RHf5/LtwvTqYGr62LhvqIEP1ewCFCEqAq7177UpIrZCOSqiCd7/fbYpOFvwZW92AZ48YDgIT2lYGb+PJeW2If1yquOf0i328CMD5YhTqXB1TtcWhg9yqQAQePhwS1reEknyWth1DemR8/F6i7K8E99qrqQy0k/xYxWKlwZJXAtGtapsyjjNwR13HEbUd8so9KXAujPdUcNVRA6sOHnL0nopkdIGzNAXnyz66mEo8SYAwOskfUxlqa8792Et/Rj/2zCEm8YwClPAPAD+h9X2/amE0YEeU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TfiFi8e11uwbmIg8CeAR3uXkVNDKCM7Ud6xjlx5Tnqd9dpPicHwOau13vS07kElKnZf/nNd959FNcDtfr62onzUUZUx3s401F/hOFzkMmPC6hiRmXunu2EUnkI2EVfG3blXUZeiMptgw8Ua7JbzxafJ3pNdiOJZowIauH/swwy212GjikDTHc9mCSsebiXNvWLp2jIcytSWQJ9I9DaIu6Juzzf8+7PH1anNQJ4C1ZYbPMGdLPT2o/sUmtg2Ud87sMHvTUjPpIhzvlIWLnqsNmOrgu0oIZeVJJUz3AqjDDd8Q5Dz6CrYgLqpCc9sFcNPyMxy8JaXlXD0uL2V7LmMCZZ+P3qA7JeQ+W+FIbLZcD+C6qwM5giMPtZLkrbkc5oQiubH5dZ0MImDR7/oFsQdKjIZHVfDRx43R+uAv9pmmJRN9kwkJSHgMEbUh8LvmPRcyt0c/PHMRm9sAiKfeh+jQ6AjtQGMGQHJG9Ys52TKqe3m9kLsZs6tzT0LXf6NIpUSJrQ5spsbO5DnZCay8aKgEEirkoM/eD+QoL52el2XugF1usHqXr4uZ+eR1pXG11Q5C X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dUkrbTBlSTlMNU1xcUYzVjJLSTE3WE1UUXJpdDZoL0RlTDlMWmpoTG1vS3B0?= =?utf-8?B?d2VDMUhpak5Oa1BJRm9aeVVlSGdabVI5K2dPZXdMd1hqTlhZTzFwSHdvSnkz?= =?utf-8?B?aWVvRkRZR2RoVU4wSVdqZ1ZzSHJWZDZwVlVqYmxnVmpSMFYyWXBtRXM3S3JK?= =?utf-8?B?NXA0OW9VczBFNWhPb1NObzBLRzIwY2tXWGJhWkdnT01VQ0VLUlVjZGZwUEdB?= =?utf-8?B?TnVIVm96S2ZaZ0pmbTBUMWFnZzcyTkVHYnFEcUVaeEhrR1A1R0hOaG9VV3Uy?= =?utf-8?B?bVJocGVUenF5UTdTQVR0WXd5RFk1R1BlSGNuUUh2YkgrTHhuUGgrSHJqQVdQ?= =?utf-8?B?QUw4N1Z0WjU4a0V6NTJIbENjRHp4TnhNOW14QzZLZjVoSnE2K1hYejJUYXRY?= =?utf-8?B?M3hJQVVjaU1IMlVKRm0wNFdLKzJibnUwK0tuZTd5K2gzaWkraGFTWnk5TWlG?= =?utf-8?B?ZlI2a2tuNFFEZ3A5YnIvclk3QTcydHdhdXRyT3IyemRXcURWeEFMQVcraXBw?= =?utf-8?B?eGtLYVdqeGlqbUg4WTV6Uy8vQjM4UnVBLzR1ZVh2aHJNZnZWd3FLYVE1b2Uw?= =?utf-8?B?TTBlTUFtRFU4UksrZG5wNWpLRTNod1R6Y1VJdll1NXA2VlNsSm43OTRtenFQ?= =?utf-8?B?TWc2bTRRbHluMmEvQUQyb2d1RG5JUC9nK0gwZkdRT1FYVEJlMCtOUWE1VjRm?= =?utf-8?B?RHJjSVVwVyszYk03Qkpvd0FMbDVrNzF4NkF1TWVkZWxETWhaaGZmY0c3Umdp?= =?utf-8?B?ejM0ZWVQVWRUc3BLbS85bVRHTnI2VDRBb1VSWUVkY0VHdE5XZGhsdWVUbExW?= =?utf-8?B?ZjRFenlldmRMeW1rQWRTSU1GRFBCS25VeDVaaTRQTlc5R1hla0g3U3IzYUFC?= =?utf-8?B?eEVFQTRqcmtPK2t4NFlBRk9rTWVWV1RSMENnVTQvbnlMOFVxTjJDeFJ0enZj?= =?utf-8?B?SnFSUlRLUTBPL3ZNVnZpRkhxaFY1TmczUjdRK1MyN1FBMjhLQmZ5a1ZYeDFt?= =?utf-8?B?UFg0QnY5dXVoUjNiZjlVcFMwL3VTeGwxeTZtUWsvaCtRMDFFc1JRcWQvRDA5?= =?utf-8?B?UVJDKzgzZFdLQmNYRi9zTmhJM3VxaThTMDB4NVV1RDBwRFpNeW5KdFF4RW5P?= =?utf-8?B?bTNDRjR6TmpWY2ozS2kxOTJSNTc5TTErSHRjVHJvNXBib3lhdDdheGpReE04?= =?utf-8?B?NU44UCt3aHg2Vm1DMWJsN0JXWVJRUmdrcWYzTG84WE5UY3pKdnlaMitWbWhk?= =?utf-8?B?ZVJHNzYyYUduUWcra3RVU1IySGVlNFNOZDhIL1A2M2RxeFZxcDNKQ1Vycndv?= =?utf-8?B?QzhsTmNhRkcydmxUcVF2RU0xT09rNXEzMmVwL2dBTE5MMkt3MHdabDN6bUNH?= =?utf-8?B?T01leE5vdEgxK0gxeFFoK21tR1YybjI0d3oyMVhOUHYrMGMrMnFlemZZNWJ3?= =?utf-8?B?RDh6bFU3TEVUbFZrRUtlY1BUNHN0L21VOTdvaTdmWnFsQlg1V09IZWphaE1l?= =?utf-8?B?MHArU0V0eHgvRUN2RGlUVUhiSGJvcmxRcCtUOVdiLzNlM3lzSHNzUGFSK3J4?= =?utf-8?B?N1RmTmJncHN5TUFzUDZFT1B4LytyYTdMcTVlVWo5N2g5YTNReHlldlI3bkFJ?= =?utf-8?B?Wm1ERUEwMmprL3F4N1pkWUYvaUkrdjdjVGp0ajM5SytVa05BVnF3SFlPbzVZ?= =?utf-8?B?TjExVE1HWit0ODNrRXlXRVRac2pCUXNjMk5OUTVNM2REUlJHSis4TVlRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 900c2e4b-b18d-484f-f516-08dc42725a83 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2024 08:56:49.4840 (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: AS8P250MB0008 Subject: Re: [FFmpeg-devel] [PATCH] lavu/attributes: add ff_ prefix to attribute_deprecated 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: Anton Khirnov: > Otherwise it might conflict with caller-defined identifiers. > > ff because it is not supposed to be used by external callers. > --- This is public, so it should be av_attribute_deprecated. For the same reason it is actually an API break to no longer provide the un-prefixed version. Is this just a general precaution or did you run into an actual conflict? > doc/developer.texi | 2 +- > doc/print_options.c | 4 ++-- > libavcodec/avcodec.h | 4 ++-- > libavcodec/avfft.h | 30 +++++++++++++------------- > libavcodec/packet.h | 4 ++-- > libavcodec/vdpau.h | 8 +++---- > libavfilter/avfilter.h | 4 ++-- > libavformat/avformat.h | 12 +++++------ > libavutil/attributes.h | 12 ++++++++--- > libavutil/frame.h | 12 +++++------ > libavutil/hdr_dynamic_vivid_metadata.h | 12 +++++------ > libavutil/version.h | 1 + > 12 files changed, 56 insertions(+), 49 deletions(-) > > diff --git a/doc/developer.texi b/doc/developer.texi > index c86bb5820c..141139df8c 100644 > --- a/doc/developer.texi > +++ b/doc/developer.texi > @@ -522,7 +522,7 @@ removing the API - this is described in @ref{Major version bumps}. > > To deprecate an API you should signal to our users that they should stop using > it. E.g. if you intend to remove struct members or functions, you should mark > -them with @code{attribute_deprecated}. When this cannot be done, it may be > +them with @code{ff_attribute_deprecated}. When this cannot be done, it may be > possible to detect the use of the deprecated API at runtime and print a warning > (though take care not to print it too often). You should also document the > deprecation (and the replacement, if applicable) in the relevant Doxygen > diff --git a/doc/print_options.c b/doc/print_options.c > index fd1cf10dc1..89df2928b8 100644 > --- a/doc/print_options.c > +++ b/doc/print_options.c > @@ -35,8 +35,8 @@ > #include "libavutil/opt.h" > > /* Forcibly turn off deprecation warnings, which just add noise here. */ > -#undef attribute_deprecated > -#define attribute_deprecated > +#undef ff_attribute_deprecated > +#define ff_attribute_deprecated > > #include "libavcodec/options_table.h" > > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > index 21fc74707f..0c1c4eec41 100644 > --- a/libavcodec/avcodec.h > +++ b/libavcodec/avcodec.h > @@ -572,7 +572,7 @@ typedef struct AVCodecContext { > * - encoding: Set AVCodecContext.framerate instead > * > */ > - attribute_deprecated > + ff_attribute_deprecated > int ticks_per_frame; > #endif > > @@ -2370,7 +2370,7 @@ int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **op > * multiple times is not supported anymore -- use multiple codec contexts > * instead. > */ > -attribute_deprecated > +ff_attribute_deprecated > int avcodec_close(AVCodecContext *avctx); > #endif > > diff --git a/libavcodec/avfft.h b/libavcodec/avfft.h > index e3a0da1eb9..1cf1cd6df1 100644 > --- a/libavcodec/avfft.h > +++ b/libavcodec/avfft.h > @@ -50,14 +50,14 @@ typedef struct FFTContext FFTContext; > * @param inverse if 0 perform the forward transform, if 1 perform the inverse > * @deprecated use av_tx_init from libavutil/tx.h with a type of AV_TX_FLOAT_FFT > */ > -attribute_deprecated > +ff_attribute_deprecated > FFTContext *av_fft_init(int nbits, int inverse); > > /** > * Do the permutation needed BEFORE calling ff_fft_calc(). > * @deprecated without replacement > */ > -attribute_deprecated > +ff_attribute_deprecated > void av_fft_permute(FFTContext *s, FFTComplex *z); > > /** > @@ -65,25 +65,25 @@ void av_fft_permute(FFTContext *s, FFTComplex *z); > * input data must be permuted before. No 1.0/sqrt(n) normalization is done. > * @deprecated use the av_tx_fn value returned by av_tx_init, which also does permutation > */ > -attribute_deprecated > +ff_attribute_deprecated > void av_fft_calc(FFTContext *s, FFTComplex *z); > > -attribute_deprecated > +ff_attribute_deprecated > void av_fft_end(FFTContext *s); > > /** > * @deprecated use av_tx_init from libavutil/tx.h with a type of AV_TX_FLOAT_MDCT, > * with a flag of AV_TX_FULL_IMDCT for a replacement to av_imdct_calc. > */ > -attribute_deprecated > +ff_attribute_deprecated > FFTContext *av_mdct_init(int nbits, int inverse, double scale); > -attribute_deprecated > +ff_attribute_deprecated > void av_imdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); > -attribute_deprecated > +ff_attribute_deprecated > void av_imdct_half(FFTContext *s, FFTSample *output, const FFTSample *input); > -attribute_deprecated > +ff_attribute_deprecated > void av_mdct_calc(FFTContext *s, FFTSample *output, const FFTSample *input); > -attribute_deprecated > +ff_attribute_deprecated > void av_mdct_end(FFTContext *s); > > /* Real Discrete Fourier Transform */ > @@ -104,11 +104,11 @@ typedef struct RDFTContext RDFTContext; > * > * @deprecated use av_tx_init from libavutil/tx.h with a type of AV_TX_FLOAT_RDFT > */ > -attribute_deprecated > +ff_attribute_deprecated > RDFTContext *av_rdft_init(int nbits, enum RDFTransformType trans); > -attribute_deprecated > +ff_attribute_deprecated > void av_rdft_calc(RDFTContext *s, FFTSample *data); > -attribute_deprecated > +ff_attribute_deprecated > void av_rdft_end(RDFTContext *s); > > /* Discrete Cosine Transform */ > @@ -134,11 +134,11 @@ enum DCTTransformType { > * > * @deprecated use av_tx_init from libavutil/tx.h with an appropriate type of AV_TX_FLOAT_DCT > */ > -attribute_deprecated > +ff_attribute_deprecated > DCTContext *av_dct_init(int nbits, enum DCTTransformType type); > -attribute_deprecated > +ff_attribute_deprecated > void av_dct_calc(DCTContext *s, FFTSample *data); > -attribute_deprecated > +ff_attribute_deprecated > void av_dct_end (DCTContext *s); > > /** > diff --git a/libavcodec/packet.h b/libavcodec/packet.h > index b0ba3baea2..969622456d 100644 > --- a/libavcodec/packet.h > +++ b/libavcodec/packet.h > @@ -567,7 +567,7 @@ typedef struct AVPacket { > } AVPacket; > > #if FF_API_INIT_PACKET > -attribute_deprecated > +ff_attribute_deprecated > typedef struct AVPacketList { > AVPacket pkt; > struct AVPacketList *next; > @@ -649,7 +649,7 @@ void av_packet_free(AVPacket **pkt); > * @deprecated This function is deprecated. Once it's removed, > sizeof(AVPacket) will not be a part of the ABI anymore. > */ > -attribute_deprecated > +ff_attribute_deprecated > void av_init_packet(AVPacket *pkt); > #endif > > diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h > index 8021c25761..9b68b5a123 100644 > --- a/libavcodec/vdpau.h > +++ b/libavcodec/vdpau.h > @@ -100,18 +100,18 @@ typedef struct AVVDPAUContext { > * Allows extending the struct without breaking API/ABI > * @deprecated use av_vdpau_bind_context() instead > */ > -attribute_deprecated > +ff_attribute_deprecated > AVVDPAUContext *av_alloc_vdpaucontext(void); > > /** > * @deprecated render2 is public and can be accessed directly > */ > -attribute_deprecated > +ff_attribute_deprecated > AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *); > /** > * @deprecated render2 is public and can be accessed directly > */ > -attribute_deprecated > +ff_attribute_deprecated > void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2); > #endif > > @@ -162,7 +162,7 @@ int av_vdpau_get_surface_parameters(AVCodecContext *avctx, VdpChromaType *type, > * @return Newly-allocated AVVDPAUContext or NULL on failure. > * @deprecated use av_vdpau_bind_context() instead > */ > -attribute_deprecated > +ff_attribute_deprecated > AVVDPAUContext *av_vdpau_alloc_context(void); > #endif > > diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h > index a34e61f23c..593abf647f 100644 > --- a/libavfilter/avfilter.h > +++ b/libavfilter/avfilter.h > @@ -680,13 +680,13 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, > /** > * @deprecated this function should never be called by users > */ > -attribute_deprecated > +ff_attribute_deprecated > void avfilter_link_free(AVFilterLink **link); > > /** > * @deprecated this function should never be called by users > */ > -attribute_deprecated > +ff_attribute_deprecated > int avfilter_config_links(AVFilterContext *filter); > #endif > > diff --git a/libavformat/avformat.h b/libavformat/avformat.h > index de40397676..7c847842d0 100644 > --- a/libavformat/avformat.h > +++ b/libavformat/avformat.h > @@ -862,7 +862,7 @@ typedef struct AVStream { > * @deprecated use AVStream's @ref AVCodecParameters.coded_side_data > * "codecpar side data". > */ > - attribute_deprecated > + ff_attribute_deprecated > AVPacketSideData *side_data; > /** > * The number of elements in the AVStream.side_data array. > @@ -870,7 +870,7 @@ typedef struct AVStream { > * @deprecated use AVStream's @ref AVCodecParameters.nb_coded_side_data > * "codecpar side data". > */ > - attribute_deprecated > + ff_attribute_deprecated > int nb_side_data; > #endif > > @@ -1891,7 +1891,7 @@ void av_format_inject_global_side_data(AVFormatContext *s); > * @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE. > * @deprecated duration_estimation_method is public and can be read directly. > */ > -attribute_deprecated > +ff_attribute_deprecated > enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx); > #endif > > @@ -2088,7 +2088,7 @@ int avformat_stream_group_add_stream(AVStreamGroup *stg, AVStream *st); > * @deprecated use av_packet_side_data_add() with the stream's > * @ref AVCodecParameters.coded_side_data "codecpar side data" > */ > -attribute_deprecated > +ff_attribute_deprecated > int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type, > uint8_t *data, size_t size); > > @@ -2103,7 +2103,7 @@ int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type, > * @deprecated use av_packet_side_data_new() with the stream's > * @ref AVCodecParameters.coded_side_data "codecpar side data" > */ > -attribute_deprecated > +ff_attribute_deprecated > uint8_t *av_stream_new_side_data(AVStream *stream, > enum AVPacketSideDataType type, size_t size); > /** > @@ -2118,7 +2118,7 @@ uint8_t *av_stream_new_side_data(AVStream *stream, > * @deprecated use av_packet_side_data_get() with the stream's > * @ref AVCodecParameters.coded_side_data "codecpar side data" > */ > -attribute_deprecated > +ff_attribute_deprecated > uint8_t *av_stream_get_side_data(const AVStream *stream, > enum AVPacketSideDataType type, size_t *size); > #endif > diff --git a/libavutil/attributes.h b/libavutil/attributes.h > index 04c615c952..3723683a31 100644 > --- a/libavutil/attributes.h > +++ b/libavutil/attributes.h > @@ -26,6 +26,8 @@ > #ifndef AVUTIL_ATTRIBUTES_H > #define AVUTIL_ATTRIBUTES_H > > +#include "version.h" > + > #ifdef __GNUC__ > # define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > (x) || __GNUC__ == (x) && __GNUC_MINOR__ >= (y)) > # define AV_GCC_VERSION_AT_MOST(x,y) (__GNUC__ < (x) || __GNUC__ == (x) && __GNUC_MINOR__ <= (y)) > @@ -97,11 +99,15 @@ > #endif > > #if AV_GCC_VERSION_AT_LEAST(3,1) > -# define attribute_deprecated __attribute__((deprecated)) > +# define ff_attribute_deprecated __attribute__((deprecated)) > #elif defined(_MSC_VER) > -# define attribute_deprecated __declspec(deprecated) > +# define ff_attribute_deprecated __declspec(deprecated) > #else > -# define attribute_deprecated > +# define ff_attribute_deprecated > +#endif > + > +#if FF_API_ATTRIBUTE_DEPRECATED > +#define attribute_deprecated ff_attribute_deprecated > #endif > > /** > diff --git a/libavutil/frame.h b/libavutil/frame.h > index b94687941d..f7ffbaa57f 100644 > --- a/libavutil/frame.h > +++ b/libavutil/frame.h > @@ -432,7 +432,7 @@ typedef struct AVFrame { > * > * @deprecated Use AV_FRAME_FLAG_KEY instead > */ > - attribute_deprecated > + ff_attribute_deprecated > int key_frame; > #endif > > @@ -513,7 +513,7 @@ typedef struct AVFrame { > * > * @deprecated Use AV_FRAME_FLAG_INTERLACED instead > */ > - attribute_deprecated > + ff_attribute_deprecated > int interlaced_frame; > > /** > @@ -521,7 +521,7 @@ typedef struct AVFrame { > * > * @deprecated Use AV_FRAME_FLAG_TOP_FIELD_FIRST instead > */ > - attribute_deprecated > + ff_attribute_deprecated > int top_field_first; > #endif > > @@ -529,7 +529,7 @@ typedef struct AVFrame { > /** > * Tell user application that palette has changed from previous frame. > */ > - attribute_deprecated > + ff_attribute_deprecated > int palette_has_changed; > #endif > > @@ -646,7 +646,7 @@ typedef struct AVFrame { > * @deprecated use AV_CODEC_FLAG_COPY_OPAQUE to pass through arbitrary user > * data from packets to frames > */ > - attribute_deprecated > + ff_attribute_deprecated > int64_t pkt_pos; > #endif > > @@ -680,7 +680,7 @@ typedef struct AVFrame { > * @deprecated use AV_CODEC_FLAG_COPY_OPAQUE to pass through arbitrary user > * data from packets to frames > */ > - attribute_deprecated > + ff_attribute_deprecated > int pkt_size; > #endif > > diff --git a/libavutil/hdr_dynamic_vivid_metadata.h b/libavutil/hdr_dynamic_vivid_metadata.h > index 4524a81557..8842b203a7 100644 > --- a/libavutil/hdr_dynamic_vivid_metadata.h > +++ b/libavutil/hdr_dynamic_vivid_metadata.h > @@ -174,7 +174,7 @@ typedef struct AVHDRVividColorToneMappingParams { > * of 0 to 3, inclusive. > * @deprecated Use three_spline instead > */ > - attribute_deprecated > + ff_attribute_deprecated > int three_Spline_TH_mode; > > /** > @@ -182,7 +182,7 @@ typedef struct AVHDRVividColorToneMappingParams { > * and in multiples of 1.0/255. > * @deprecated Use three_spline instead > */ > - attribute_deprecated > + ff_attribute_deprecated > AVRational three_Spline_TH_enable_MB; > > /** > @@ -191,7 +191,7 @@ typedef struct AVHDRVividColorToneMappingParams { > * and in multiples of 1.0/4095. > * @deprecated Use three_spline instead > */ > - attribute_deprecated > + ff_attribute_deprecated > AVRational three_Spline_TH_enable; > > /** > @@ -200,7 +200,7 @@ typedef struct AVHDRVividColorToneMappingParams { > * and in multiples of 0.25/1023. > * @deprecated Use three_spline instead > */ > - attribute_deprecated > + ff_attribute_deprecated > AVRational three_Spline_TH_Delta1; > > /** > @@ -209,7 +209,7 @@ typedef struct AVHDRVividColorToneMappingParams { > * and in multiples of 0.25/1023. > * @deprecated Use three_spline instead > */ > - attribute_deprecated > + ff_attribute_deprecated > AVRational three_Spline_TH_Delta2; > > /** > @@ -218,7 +218,7 @@ typedef struct AVHDRVividColorToneMappingParams { > * and in multiples of 1.0/255. > * @deprecated Use three_spline instead > */ > - attribute_deprecated > + ff_attribute_deprecated > AVRational three_Spline_enable_Strength; > #endif > > diff --git a/libavutil/version.h b/libavutil/version.h > index 09f8cdc292..757ae6c082 100644 > --- a/libavutil/version.h > +++ b/libavutil/version.h > @@ -111,6 +111,7 @@ > #define FF_API_FRAME_KEY (LIBAVUTIL_VERSION_MAJOR < 60) > #define FF_API_PALETTE_HAS_CHANGED (LIBAVUTIL_VERSION_MAJOR < 60) > #define FF_API_VULKAN_CONTIGUOUS_MEMORY (LIBAVUTIL_VERSION_MAJOR < 60) > +#define FF_API_ATTRIBUTE_DEPRECATED (LIBAVUTIL_VERSION_MAJOR < 60) > > /** > * @} _______________________________________________ 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".