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 F38CC43A6A for ; Sat, 6 Aug 2022 11:50:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2513068B70F; Sat, 6 Aug 2022 14:50:48 +0300 (EEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072052.outbound.protection.outlook.com [40.92.72.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FC8768B373 for ; Sat, 6 Aug 2022 14:50:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HsHZoZ+P0gCnf6ypFgOXpS6vMOHQhIU1lW4jjEkJ/Z11aZ9dBtVcTYfD63pxrmZFHeOR5N7nvow0mmjHiBh6UVcK7IlS1k2I8HE/xzZayvW3dweXjPSk18euQED00FEogiQCzLOOkLiuWK3pcXYTs1rOr2591X71Lc+xIszL8dWxyLEtHoRwNjokyYSP6VH1yFqDPjDkjLB8dcseY+G+q7nnGpZO3j2xXZ2mkCwJ2M836ikLQIxYfIHu4dlYgD7ElyW4M1FltKXcD5tMrVwTw7LhTQW4vbJZJqyH8MrdgUzJHMlhFGZOXV2+vqKSO4xF5tyytN1hDbB/nh6ujLDDfA== 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=SVaoKbzqJMvG726ZOAxKuWC2RhXdjEAHBOHiZ8723Qo=; b=MVA6O+iN98AmK+a8gJEoH8X/zE2eLIQZzY2ftWzMDyKFPOZqF+imnC4RHSGu7HI5/X0+lZIPKWHSRXVHFnK6Ed1/JeOuyaw5qNbWgutN60Twuw0+fxKqp6enQT3529/rfncRI86KWU8qd/h2G1N/0JzMdUGCcH73RtOWmnLHoa6boBKlAyBIxulRTr53oQ6oGQi2piqUi2S4xli42bXE6sUhRkNI35GOof/bHuDS78mCQ5fHPcqI/5ah+ViE6EDRQbGs7bsawVyhuxLH5k/vJ06luJz+t9sVdeC03SIaruDcchbAL4m7VEfmMX/QNsx8U53HDoQ5Y3sujPELK9ukgg== 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=SVaoKbzqJMvG726ZOAxKuWC2RhXdjEAHBOHiZ8723Qo=; b=CLtXvcCszLBwwst6rFUP5CuXVZLjkjI6877JpquaGEn85wfcaCtq01Ye0sPP/rNojnB1unx6CuPurt36QZGXgQxAONBJf0wQM/WFaDNJh/LHN0gwcbZsfQXcbRcsMI6YzvDOvMwEprIAOCCvy19thDnLlXghvJqoy3e0E5MB5vYkF8SD/HTYF/4977U9Nlm6BOAs/cm2bUIV+oXo+nb+YSyKI2U5TxbF5NxO6r+6zOslEB8AqqVZ6j9hgpQ4AwpgHo3POXzWgDZWdl2KVNi+vtm8NGYXIj5x2M6KN28iTh/4yMuavDFEfqAMPUi1wbfdSmBF5zgMfQZCWEk4sQo38Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR0101MB2254.eurprd01.prod.exchangelabs.com (2603:10a6:800:25::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Sat, 6 Aug 2022 11:50:40 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.016; Sat, 6 Aug 2022 11:50:40 +0000 Message-ID: Date: Sat, 6 Aug 2022 13:50:37 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220805210039.4158-1-rcombs@rcombs.me> From: Andreas Rheinhardt In-Reply-To: <20220805210039.4158-1-rcombs@rcombs.me> X-TMN: [yj6HhPdVzOl71Rv5Co/PqffAov7gFT4Y] X-ClientProxiedBy: ZR0P278CA0037.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::6) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 83561a55-fb6b-44fc-3c39-08da77a1e2ae X-MS-TrafficTypeDiagnostic: VI1PR0101MB2254:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QQeVwHMbsuuIR90q8ONYEq5ytHfDvuJF2+wLypxUIUKw/rUAJ4sgnIyCMqL/072hCELmFx7Chs+bGxs3KJ6NhpZxv5ig2L+NUbjFRYiyC6wlTH+NW7hUAnbEcdrRWd8nDQTRs4AGHrlJVKzOxcGjYjc1fW6LRq8EgqFWlldrJR64DBYRudqFl+iHvEG9KDJCu3lu2VU3OIvPaqBhcaApuAj86XhPFbgyjRqbrgMpQkjMIWQEMkTN7PnQKkr4HFJuCPV1jA+zViqZXUCWqp+5tRZzra016qxt/GZpBmiwwVs+oR6o1GB5KHXDfgniNDmtZBp8Iiqa/pAyhYJQeNrue8Gs/wLc+9qyXRAvjdOw696/edpmj9FzhseDX06YMsSqCdZj0/QIr/IW0zXOPYblfCvbIdUvG3UuxOAqjnt/+DuJJlCt+p7npKZOYMX5WLCYjL/384mLfaGVrb6191+4qvMyRqYHWpkhRHyjqsljl86gcjHCauLjZQoF+nLSgtXh0gkX63QVRtfpX9BbsFsOILdFAWpILRK/SP/KXualoAjisTobDMT0l2cfeyaDZQEHHeOPCeT2qu3CIsw+LTzFRGTLaPFFWRJIbbYpuo50oxonxubV60KSgsWUSLppUrk2SjfpydxnGCdaxGvHQiT2MunPgu3LK5yn7mPVxi1LR2HDOY9Lwe65jSr9T6oxGuOy X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dkJmNUNhNS93MFlZYko5b1I5b3ZHQmZ0NVlnN1dSaTR6OHVTSHZVOThQWDhP?= =?utf-8?B?NVVWVTE1WFlRaFRKMFk5aTAyQzhBL3diQ2laK3ZIVFhqRXZXNklCMFJEVE1X?= =?utf-8?B?Q2ZHRGUzV2R6QUIyK2xkS3dqQW4vVEVrN1lkWVRhWnFJSUJOSVJPZUlzRGRj?= =?utf-8?B?cktlY01naE1uK3p5V0JtNjlqWVk5bDJ1TTlMWkpuMWVCU1RNdkJiZE5kVFlP?= =?utf-8?B?bEU2RERHU053UmxGaG9ONWFQdlh6K0RkQmNUdnQ4MUFqZWdaUDVWZVA3dkps?= =?utf-8?B?SlQ1NnRKMGlVQW5yTUV4S1lNcTdGSkp2QXdrWStKS0daaGtxS0JXVk1KQ3Bt?= =?utf-8?B?ZWMvNTJQTmtqK3NQUDNIR21wUzlIaWx1L2hnV0huK1QyRHNkY3Bsd2F1T3F3?= =?utf-8?B?Y3RTZlhKSTF1TnJCcWt1T3hxN01iQjhzNnBwS25qS2xEUDc0U0dIV2gzUDNs?= =?utf-8?B?VFNKRU5VSGNwSTJaRUN4dUxVSE1qR2Q3WlVnZDUxZXNhR25nVlJxYi9vR0pr?= =?utf-8?B?ZU1kNWY4TFp3RWY3b3JMRFdjZ3BZZVZnN1lJKzBxS3FwaFppVmpBeUZHd3NY?= =?utf-8?B?bE9QSFZTNEhVbVBxYU9lNjV3L1ByU3F3QmRXdUNrUHB4VU5ET21ncjFUcjVt?= =?utf-8?B?VHhtS2VTbjhFU0kraHNydUJBNThmeUx4MzdNdXBwTkF3dE5jQUhNUW84VndO?= =?utf-8?B?MTRaR0sxTTFObkVsekNRcFZYd0FQQlNQcklPZHF6QjIveG1jcWc3K2pFMUx2?= =?utf-8?B?MGsyVzFUVXp2N2VDUFZpd3JrUE9CM3hyR2w3ZUhITW91ZEllZjlaQVRwUDNX?= =?utf-8?B?MkRxTHMvSFZkV2NsbFVTY2FTK3FNcFhrU3ZTcnRsSVVIeTk4aUkrdkpqV0hu?= =?utf-8?B?R05ndDhZV0psa3RRbG84dUhVdVpzSlNuSDdsbXRYTTFvYzZxb05qbmhGRGJR?= =?utf-8?B?Zmc1cHFvUUpzUFo0QzV4TDJmMmkrK0lzeXhycFFpeHJrUVUvY3RWYllDRjl5?= =?utf-8?B?dzZpNGlVMHpaaTFBTmVrZWNLL3gwekV2djFTN0RDSDZWUllianJKS0Y1RWx0?= =?utf-8?B?SWFaY09kWWpMbGNQSldwRmFnd1pKR2lsaEl1M25rNWljdEdrdjlkWUhaWWdj?= =?utf-8?B?U1A4WnNkcW83QlRqYlZITkp0NEs3SzkwY0NIWkNHYlc2M3R3dm1CVlkvQ2w5?= =?utf-8?B?Q0JPVG52amRlWEQ1bnZleVk5YzJVQmtUbUU1TFYyK3U2VlZuKy9WUVJtY2Yx?= =?utf-8?B?bEs1b3hGQWRFeXpnVXYvaHVqMnJNYlBTSGxBbnVuNGVsckZCQWltaENnVVhx?= =?utf-8?B?YU5WUVM3K3dxQVM3Vk9qa0xnSmNwOGlxZVZ1OU04RWJQSld5Vjl6TExpZ0ll?= =?utf-8?B?Njk4THFnQWpSTFFHUXdqQUd2dWZLOW9nU0tVdDI2UzJRZlgxNTJVL2YvenFo?= =?utf-8?B?eXpnL01nc1llancrdHV2WlBWZncrcTNGVjhBUnkxK3FDRlE1MWFQMkdLeHgx?= =?utf-8?B?eXJ6VWhpZXp3RVExN2RwNExVWlE4ZDNUVFlsbXNORjBicFBFS0hnUzh2Q0Zv?= =?utf-8?B?OWVPVU55UGxDRkZiV0F2emtDN2NnWEJvWWRvQnB2cHJMaFZ1Zndac0NZRVli?= =?utf-8?B?QkwxVG0vSk1TNUhXdDVQL1h0WnpUYVNUaXJHcUk5VjcyQkFIMDc0NG1zWnoz?= =?utf-8?B?UUNYSE5BT0dSK1V5MTlWby9VblhOaHRjQmpPMmN6RmgrMUFvQXZuM0ZWMDh3?= =?utf-8?Q?0l2/mdDzyQX5jy29bk=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83561a55-fb6b-44fc-3c39-08da77a1e2ae X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2022 11:50:40.6293 (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: VI1PR0101MB2254 Subject: Re: [FFmpeg-devel] [PATCH] lswr: take const AVChannelLayout* in swr_alloc_set_opts2() 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: rcombs: > This is fully backwards-compatible in both ABI and API, > so it's only a minor bump. It is not fully backwards-compatible API-wise: If you use a function pointer for swr_alloc_set_opts2 by hardcoding its type, you will get warnings now (or even errors depending upon your -Werror; it is an error by default for C++). Given that I do not know about other language bindings I have so far refrained from applying https://patchwork.ffmpeg.org/project/ffmpeg/patch/AS1PR01MB95649A21F5F9A45D40E6AC1D8F1F9@AS1PR01MB9564.eurprd01.prod.exchangelabs.com/ This does not mean that I block your patch; to the contrary: If it breaks nothing, I will apply the above patch after a month or so. - Andreas > --- > libswresample/swresample.c | 4 ++-- > libswresample/swresample.h | 4 ++-- > libswresample/version.h | 2 +- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/libswresample/swresample.c b/libswresample/swresample.c > index 9b77ef65bf..123ac65693 100644 > --- a/libswresample/swresample.c > +++ b/libswresample/swresample.c > @@ -83,8 +83,8 @@ FF_ENABLE_DEPRECATION_WARNINGS > #endif > > int swr_alloc_set_opts2(struct SwrContext **ps, > - AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, > - AVChannelLayout *in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, > + const AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, > + const AVChannelLayout *in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, > int log_offset, void *log_ctx) { > struct SwrContext *s = *ps; > int ret; > diff --git a/libswresample/swresample.h b/libswresample/swresample.h > index 26d42fab8d..980be65783 100644 > --- a/libswresample/swresample.h > +++ b/libswresample/swresample.h > @@ -286,8 +286,8 @@ struct SwrContext *swr_alloc_set_opts(struct SwrContext *s, > * On error, the Swr context is freed and *ps set to NULL. > */ > int swr_alloc_set_opts2(struct SwrContext **ps, > - AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, > - AVChannelLayout *in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, > + const AVChannelLayout *out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate, > + const AVChannelLayout *in_ch_layout, enum AVSampleFormat in_sample_fmt, int in_sample_rate, > int log_offset, void *log_ctx); > /** > * @} > diff --git a/libswresample/version.h b/libswresample/version.h > index 66bac2fa9b..4b9952d914 100644 > --- a/libswresample/version.h > +++ b/libswresample/version.h > @@ -30,7 +30,7 @@ > > #include "version_major.h" > > -#define LIBSWRESAMPLE_VERSION_MINOR 8 > +#define LIBSWRESAMPLE_VERSION_MINOR 9 > #define LIBSWRESAMPLE_VERSION_MICRO 100 > > #define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \ _______________________________________________ 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".