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 7FF084722B for ; Thu, 31 Aug 2023 22:30:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 309CE68C822; Fri, 1 Sep 2023 01:30:36 +0300 (EEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2036.outbound.protection.outlook.com [40.92.65.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20E3668C817 for ; Fri, 1 Sep 2023 01:30:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YCCgF2xvOsKBFsE8e1+AZDxnMNL/m3Spc12M3Rc6to9He/K4eUjpsz37EGSM9CoOZinpT/a6Go7MGKRWOiXcMPvytdIxMivIh2mzoFYZ7xK6ZinGUppeu/RRY43U94IpLA3f9rmu6REHQW1lia7f29IqCKs2y09r5yTjkGG68M8V3ENCL7kAdyjtz9rgbzokvQgfvvopqCYQvkgHUxXSCJUFihAnWUgIZmOrpkGaxtQqh2W1nbrN6HV0kB/zefbhuKQ+5j3SMuKXSoEsqW4eNO7KSw7coP1cPIkzjbf/dIOBHSko2XPcihsEllHZPtWe/f396hP+8OuLtXKL8MbP7Q== 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=qIKMzOz4YgktqQGyJnY6l3p4U9FNC/Ee2EtJ3XdZgpg=; b=Sx5UWYcGBXaPRLay/SATA+LRf3GzWKqS0SZ31eGUCwn1ZFj0ZTIlm8D0evcbZ6P9Au40MykqvWjGNDRGaQZvzbVBdCAC5mBvjx9IqZlzTAqvGGcB3oGPTlJJyzzGVEAB9SwqvJosDZdwvb1r20hFEOiDDJs1eRItwapgcpyMekUH2w54psZNkRm/iJbg4NxXYXr+y85OLNCtHqHwpsfGXDYJ5KyBtj+wHiFyx33cCFslydpHxhknaTRsnVkhy/IwLNrsCD00GAAznw+5tmXNfNkOr1fe2rxTfkQLsWDfNOPRdCl24xqq8WfpyxP+lMGP6yl1gXlMtRas/ouwsnCzAQ== 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=qIKMzOz4YgktqQGyJnY6l3p4U9FNC/Ee2EtJ3XdZgpg=; b=u4Ux0xZcZXlXolmXLlFnbzKpiZb7lrGjkfb0qgZj1Ohb0ktimEX1YPBSvptn6z9xM+Yf65m9n8GjwmA/HwYaMOhVqWuTy+qcX6ZAWC1k6bCatujdUgE17CJ374s0FdVfnh5pr92JgyZ96jIbrKFHfL/uR2BJOMbuSoUatjq/+X8KX75Ld/QkxE15i8iUk7WrJItpCYbfWtEHaFe065PSMBEE4mJ2O2FNjZclS5eDRM69Rdx/QyE0Lr1ISNw2Q82wR7W/IKvm5yRGunm9/QCT6xSdjKf2fNVXz3T8+aaxnAPbruAJAEK3d6qXs/FYngfU965xKrf4qsHL8GxGRI8S2g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0418.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:27b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.21; Thu, 31 Aug 2023 22:30:27 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6699.034; Thu, 31 Aug 2023 22:30:27 +0000 Message-ID: Date: Fri, 1 Sep 2023 00:31:44 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [+36y489r9kgoCAR7eGGtCNYAx86BNnqnplqKWKMPjAU=] X-ClientProxiedBy: FR3P281CA0158.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <3f2e9e0d-1f46-0a34-07df-286ba6f187e9@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0418:EE_ X-MS-Office365-Filtering-Correlation-Id: f0e6445a-7c34-4dd5-2633-08dbaa71e003 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5Y8G/jy3Y3QYIq8P98mP2E59T041P2e2gUZNJMlRAIZGSb6N1ntL2W97x878G32aRWvNycHSutigbj+n4Y6olGjOAmdOzI38L05ED3Tj4BNEHQe0OjAxjSQ9Jf6WzkHqAyoYWY/0LgpYmI976/KnufLmJ7dj1j91Cs/uwCz84QiRr+bSodGgcOcUSY1TWdPbbt89G1gztPA3NSOsVVgXoKqa8HpTNgO5ZHC8DRO6LZY0WX9Td8cD8sFeeYiQ1WpVQ9Wygs8RVng9Nywd5++IaUjFl760O6K6lxvulqzeXot3tkI7xwYtYL+MFqokIh0xsC7omvrFlNXLIhQJdz+VEZZcbvgxPiqq/wi0yfX+ZZa4KSPp5X+oha1JhIlyjFKeEJX30K1osK41Lm74ncUkr8QWth2oNpsmEKBgZ6ou4LFXWvqTLN301Hc633I7fUPgD9W7oRV9iFuiBeRxEFfIXym8C22O7fsAo7HfD7kXqn+qbP2uUMEiURrtjM72O6atDR35fgH6cwPuYVhTCeJMpONxnsMCJ44U4PcJDoMTqV2FNoRFMKHRgsP4/snOQWL0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MWpIYXhTaVdaRHFVdWJqVytNTDU5Rmd6K1BxUlkxa2dSaHFpRlFtNjZlb0Jy?= =?utf-8?B?STBUQjJKcEtCR1drTzgxSlNRU1VnY1R4dmdrTGZTbjhYTTBLc09kOTR1YU1H?= =?utf-8?B?MGlYZ2s1aGZ1bUZRbkk4WExHVExLSlZBYjNLN1cvS1V4eFhVMEtnSkpwdnhE?= =?utf-8?B?Z052QUV0c01TVUN1Y0IxanE4TDFlSURpYXdMZldCUk00VUVYTFVDeWVRbDFB?= =?utf-8?B?WlZncjh6aTNzdEpnTDM0R2Y1SkdrSEs2TEFQRkpOUFpZVVJYNEM1cG9CS25u?= =?utf-8?B?SWxHendMdDdOQ0Y0SUhZbFVsNDEwOHd0NExOTEpENUZxa2pvWjVPSXI4Qlo5?= =?utf-8?B?cXpTcFg3VzhYdCtwUmJ3NExCRmwrVHdMNWMrSDVPaG5BQVAyM0JRKzQ5MWVH?= =?utf-8?B?KzFtdlJ4VmoxM1YvUm5BeGtESG8vS2JEOG9MOE1hMlo4NE1YbzdOUTM1VnNE?= =?utf-8?B?clRKQXd6OWh4aUxiOGp4ZTN6YXRrbmtYQlczeWI2dW1ZZW80S0ZLUnNQUnhK?= =?utf-8?B?SmVIaDQ1V1hSRndEeXJ6eFA4aUNRY0xHVi9SVVVXZHNpTnVranJSNE41RWlk?= =?utf-8?B?K2RqdWNSSTJibXpMSTdyZlNpb0JZOGtZSTFLNnlWOEJ1TFgzOWc2S2psRkxI?= =?utf-8?B?azNOSk1QMzhBc0l2Y0djTVhnYi95QklCRTdWSFR0dHI0VTRjYXdoWVpXVEhR?= =?utf-8?B?SGpJaWYxSUpDWEpkdWdiZXYwYWZqcGt1TXlCYURTNEhiQW1uSDlvWkFYZ1Rz?= =?utf-8?B?YzZUTWI1TXE2T0dSb1VMRFNiMGNUYVEvNkFubStRZ2o1VS80MmVUM1hEazlh?= =?utf-8?B?WFJ2eHZwc3orRkozZXNWZ2I0VUhzd0trZWNCUUZ1N2JTZFQ5ZWl5UlV4ZEtU?= =?utf-8?B?S1k2T05jRDZGaGs1TnFMckhRa1NHa1EzRmxwQzJ4OVJ3SU9SakhhTXoxeGti?= =?utf-8?B?TzE0T2JWa0Nkem1ncjAwaVV6OHFNZFhjZVpDdkttVGJCRW1nYnZnMHpoSGVC?= =?utf-8?B?OXFVcDBFcXcyQUxMTC9IVTJjOW9tMElObVlYeURQVjAzNllhbHhJc2M0R0xz?= =?utf-8?B?ZGRxSktQbjFFUk0zN3l4cnIyeVBNU2NvTUtWMU9NdHlsT24zUWMyT05Zby82?= =?utf-8?B?WXJTcSt3Y01ObmVXTmJ4bnUxakVuYkZ2dnY3R3NEZWpDZnpxM0s0ZFg2dzBq?= =?utf-8?B?TmEzN2lTYXVVNzJTaHZzKzFBdktwWkVvSlJpNUY3UVZJem9sejVlaDJnbzd6?= =?utf-8?B?aFIvTGt5K1JLTlJ5eHA2eWVvNDFaOWRwWUdnVkxxTGVHdERnT3k1VHdKQU14?= =?utf-8?B?blY0Nm0zN2xtWkgvNTIxR0FKVzJGVzY5alhHT0xtVFljQ2NKU1lBSTlEdjFi?= =?utf-8?B?MW9ETkMybjFaY0wyYVB3WHdxaFlsM3NaNG5rOFhWSk5jN2hYdDF5bVk0ZThW?= =?utf-8?B?WC9jOTA1YU4rNzRyWEh2UVY0M2VLRENia0Ria0k4QzhzdTBEOU41a3dKbDFK?= =?utf-8?B?Tmc3TlRkY0NqSGtnMUNoN0l0VkNyQ3RkK3M4MFkxRXoyYWRHeGhWajhQVlVJ?= =?utf-8?B?ajYxNmRXQ0o5NzIrVEZFRWpQZExTS1Q3RkZBdlBGeHE2YkNaakgvUnNXUlM1?= =?utf-8?B?MEJDaW9yTEJaU1lBc0hEVGFVYXZlekpEMktaYlBObmkwdWlENVlTN0NtSzNB?= =?utf-8?Q?z96viodfSEe85gN2IGIs?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0e6445a-7c34-4dd5-2633-08dbaa71e003 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 22:30:27.1372 (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: PRAP250MB0418 Subject: Re: [FFmpeg-devel] [PATCH] avformat/matroska(dec|enc): Rename macro to avoid clash with winbase.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: > winbase.h defines IGNORE and is included via bzlib.h when compiling > for Windows. So rename this macro to NOTHING. > Also rename the muxer macro for consistency. > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/matroskadec.c | 4 ++-- > libavformat/matroskaenc.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > index 21f52ccab2..fda77b0b89 100644 > --- a/libavformat/matroskadec.c > +++ b/libavformat/matroskadec.c > @@ -2171,8 +2171,8 @@ static int mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mo > } stereo_mode_conv [] = { > #define STEREO_MODE_CONV(STEREOMODETYPE, STEREO3DTYPE, FLAGS, WDIV, HDIV, WEBM) \ > [(STEREOMODETYPE)] = { .type = (STEREO3DTYPE), .flags = (FLAGS) }, > -#define IGNORE(STEREOMODETYPE, WDIV, HDIV, WEBM) > - STEREOMODE_STEREO3D_MAPPING(STEREO_MODE_CONV, IGNORE) > +#define NOTHING(STEREOMODETYPE, WDIV, HDIV, WEBM) > + STEREOMODE_STEREO3D_MAPPING(STEREO_MODE_CONV, NOTHING) > }; > AVStereo3D *stereo; > int ret; > diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c > index d26c0fa059..bf2ca7106b 100644 > --- a/libavformat/matroskaenc.c > +++ b/libavformat/matroskaenc.c > @@ -1633,9 +1633,9 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, > * values to be in the range 0..254. */ > #define STEREOMODE(STEREOMODETYPE, STEREO3DTYPE, FLAGS, WDIV, HDIV, WEBM) \ > [(STEREO3DTYPE)][!!((FLAGS) & AV_STEREO3D_FLAG_INVERT)] = (STEREOMODETYPE) + 1, > -#define IGNORE(STEREOMODETYPE, WDIV, HDIV, WEBM) > +#define NOTHING(STEREOMODETYPE, WDIV, HDIV, WEBM) > static const unsigned char conversion_table[][2] = { > - STEREOMODE_STEREO3D_MAPPING(STEREOMODE, IGNORE) > + STEREOMODE_STEREO3D_MAPPING(STEREOMODE, NOTHING) > }; > int fmt; > Will apply. - 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".