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 7F87447215 for ; Thu, 31 Aug 2023 17:57:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4533B68C7D5; Thu, 31 Aug 2023 20:57:29 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2010.outbound.protection.outlook.com [40.92.89.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C23AD68C069 for ; Thu, 31 Aug 2023 20:57:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h6zHYUoAA7R9GIW7vcpuGUdV/hQzPq50xQBJxCGoJu0bizklaW5fZdWfEC262OnMsy0c+H2a/8kt4t7qGoOHy9s2ZGOKzeYRpbGZp7Edvw839l2tlD6eQENGg1alUDHhpIoCjMluF1WTDKByccJNiybN48yNpuH0dBhRBjU5gzRA9FhkBRcPN8X9w8Xi9P/N3bxhlmvcXKeF6uXrJNrIbJs6tjOZUSIqVUr9DEngq5XfGXoGCcMFhUM0QYNhOP14Y+oBQP0HXVTNJqRmIsNngVUGJ6ZGtAk60vB89W4OAgk31LvYAoFHTh9xR5ITEDRfZM8Kl4vsVKGE05sW4eT1Cw== 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=Y1Ica47XSp7c8RTi7di/VhnCgR6+fioITx2Kl196/u0=; b=UGHX9bYO/SPJIqeSfzaXnGdd43rZ/xyWafOXgzhdehmCUPQ5fEyZo4wz3/UzMPUeImdddFVmUboslpebox8h9gRcZrqC3thUDamVyaXP4qJJkhEL9VB1hEH4F96ksFsLBv/+pnAGkG+2gtPW4kubY2GSpXEV6IxGsLsWcuhfy5Flqoa1KQhoWiQCzltPclAl+C8JCJJrucGeyhDKHo+BPr1KF8Ts+3di3ei1hrxjU31rwyV8KNmR0PgRzHCXUcjCt6xXo0pe/h2fFEiPxjYvXP+7BcUEh+eH7B/m/vOvbFUCO2UUNUOlTtOYHEGDtW9BpmWMmwdBJ8vnfvF7irDDSA== 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=Y1Ica47XSp7c8RTi7di/VhnCgR6+fioITx2Kl196/u0=; b=YXtKqNqZqZI5AkfzEMUrio0EWA+K/j0MAXngNYtXE5hIPEEYw8fOE8oDm6KM3q96R1cVXfVdRZ5r2HDiMb9n4Odn85A2j3D9189gXNxfcHXNBNJg9G9EchLKUot6dsTYNQ3JpAQPEHwV6hQkZ/WM6v1UJZc+w9pY6XerIPQ/ldpqaHF+M71sjR2RSF7sMZ0At3XM1vf3JRU7PgAGSQVuvkXeP51H8t3UcPn+xPpWKJyRe93Qf9RIBPHJezZoAhPXmNsYIxsBhXMPwDGNaVlJtB02gpVOC1/sdSyCADmza04EFKekzF+O5C7oDOVxhe14sJ9iKwg/Pr2IrMCmhDp64A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0287.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.20; Thu, 31 Aug 2023 17:57:21 +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 17:57:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Aug 2023 19:58:31 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [aoVLmLY+aN6ahSAHY1+tH4Yx5LQ3I+/QUGLUI5++BNA=] X-ClientProxiedBy: ZR0P278CA0002.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230831175831.3916954-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0287:EE_ X-MS-Office365-Filtering-Correlation-Id: d14ffeed-16d2-435a-77ca-08dbaa4bb903 X-MS-Exchange-SLBlob-MailProps: 0wLWl8rLpvvMJrI8b7LEOlK8aVzXDUt9KfdW6Epi+7iyPT9dSXXFSSF4zlpSL58hqcjGDtakVp/mBudqj+Sa28Iej2bqFSuauSUMLz/vGscujiJx7Ly8zQhqM88eZADplPCy/CVUkqwmhQF9m5UPA898w5BECgOf5YJ3cF4echqgaMiaQPtZL9qUTtG2eO4AV4mxldRoUwX+wfQVr2HFRfNtJq9AzWWRuvL117lrZ1cgRNVQjZeuY7vUd5HeT7QW8CyvphsXv6UNvNwhm5qXcqqiaz7m1MLklqKGSQD7x7W/+J9D6Muh9uXabHz2Dg4MPnt+fhDPEFgP/siCxbWe7B2t8LmSeM44Ou2b3rvtnEhVBSj81/qU6+jOdP/buWh6BX4gGZI92I2gP+fckSrZZDJfidRL43G8g35+z+HzrwzozQ6aN8h8AOGESSUrzOOoyVPDnk7HF155TMbVk5K+3CNDSBoI/kAGH79ZlZQ43jYuywTBzf3xC+lKmQ7+wuVgK3mF7LnJH6EzMs5RSxgV3Mo1Ox47fjJ8yNkVk5EO4H+sxc/TG+wNSMmiKBJMRjm7zs/wwK6sSCbnukat0OclqXKgLeIUZmslOYcwXDiCR79UwSil5WYA4HuxAAe+OEFOS+58apsFsVU64ImaJrqsnzh8PJjoRRbnHm7Eh0x1V10nZ3TDrm7LavkNjfUikn2GaQnBMXFNr19diU1G/Z7d1Nmb1Z4tiD+JtoExvr9wUM+ihYVCl6dIQ9KS02ZxWE5uFjOz6q3QD1A= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5XaZfXhZ+ZX0/OjnPwfP/3vUABKj7E8RDVX4eASogd8gkMOuTTMb3t1icQQV7jnZxjyAPFiSJOtsE2AU1GBj2HkFu9NEI2nchE4H0EO6NDSJqtKLkAUHNEIj4nZqELSVoYUjibuJw0DriBHIMSyTsIPTapnWWdvpvmRmAcXTlE9zq6ykirepIlS0bl9zEG+c0NIhAwidvinxaUl7oIZlIiblpOzeuVLjp70NilpS+VMIWv/g4Kcs01E6iFVEk8dIjtiVA5n4dCnYyZbxF0gkXIgWdpORV1yBE7YEtDk92pQffOZ49PfNriKP5G7kTLrrjUEIp1PFNbGt96digg4Rk7K21GnzW/LhHo+uLLZvO8oh7d+VWUlJ41gIh5Q8I1N2qtC3s6eBdLMZ6a0S7UuKownDbjgDzDkp8klHWRy4+yABR7gELdB76VJA6epEl9V8gVUEhCFKqOfZM3zR2XnG5u0cB7QN9k86g1gXFGYR7Jthww3ETJ+b1lt99cDMkgWknk5tqBM//acpEbNf1wX5xjwCdvI4+klTJSqEABm5HlfjbeEv2j51T7+6410WJ16xifBg1IBS1jOKzVXfw6IhNRbPXNkQsrAJmPEZvPKIkCo= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ICZydda+zqVIcN/6QiGgV4qHRNJGjeHWPb3LyeO7DF1uPL7Bw4cfrb5DkIPc?= =?us-ascii?Q?Teb2q49IcVMJUctGbiV4sS2G8I5UeLZl0wln0ZonKiLNf+qS1i6XLJUWmBo0?= =?us-ascii?Q?7EG2mKcmDmtGT4rlUyTVi7uwc+wpnIA6Qlm3xDgwuZsrn6Bx1UkKBsuBXflw?= =?us-ascii?Q?bGI2ABqhteZ8NJfU7szF8yXRN+P4w8Zl29k8aPN0Li4ebQeEs1Zn0Wq9mzp1?= =?us-ascii?Q?r9vDwU7nYpIvKx1ve1xJb+XxfMogMjFAnORmEhkWyVGi+Okuh6hct5fCq1aF?= =?us-ascii?Q?QAdls2so3zdUJjK1bLJHmcjhgBoH5CLC2E3yGc7bmCE8o/+xt/LRt8GgslWc?= =?us-ascii?Q?bJ3fIEwdlNW/Pd+JpzxdYOXDrED2WKjHceUPYpA93W80XRyxrVWWKARpULx7?= =?us-ascii?Q?3jukgFzotlYprQAZ8RYVVOsmrgOuka0znfhNJI3fUQaY2T3ax8a4jozI4/U/?= =?us-ascii?Q?SkVpz81XumkZGQEJhHjykk27U1/Bs4BuKeSlWR8tTwy2zh4RcZcrhL5BRsMp?= =?us-ascii?Q?Yf4c8wKQL+1D3TqxS1r7p7JGRW1ufe1zSA8PyjQR0DR0w34a5Yb2Ayh3uKhi?= =?us-ascii?Q?UFF1Vv5tCbTuKrKNdEJJN4g3AkoagZkzWGSdjzUL2+JvhQqCcmPv3U8nvFyw?= =?us-ascii?Q?AqgCy7eydkxhNEGzygWoQag5u+Y8Ml5YKIrItX2w+h4blorpKq4iZszveRW0?= =?us-ascii?Q?65TfuiUf1zEi2Nusz4CCaCpcBnreBXuABm/3EL+BLcWY0lveI8xfLgvd4hZS?= =?us-ascii?Q?yTFU/zuyrtvvj0Y0cCdXwUiJkrZx9yGhzqmhw5K8f9NNI8I7Rz/06lDpXS+F?= =?us-ascii?Q?0/EEb+Whb3KM/noXa8xcBJZgJI6LRKwxPP3liO2Yen2Tjq2uDxvMlLTLKx22?= =?us-ascii?Q?1MRz0TfT9dc4txF6BICZ20MERkx/wRI5/9QQaG2h8hy/NIAl2TiMc8ZFSBj1?= =?us-ascii?Q?91X/+AFgW4dyK5GQBEtG3WAFNj7d2vWdHtke6qyk3JTu5KcfpDE0pZyA8ceb?= =?us-ascii?Q?1xbb01dJFcjxSkFNXZUnoxfAP0BeY5dEZvQ3ykoC5C1++cbmiH5tFZEiW6g2?= =?us-ascii?Q?5+QcqjADp9UggUMwypf/cKVid5sSZFjz8lSRIkAVT3AUjE+O1TTqA7hWExxE?= =?us-ascii?Q?yeJQJ+YedHig0oSppEUVp5YUonAM/COrvDuxE5QtwU8fr8qhtgtXjNvMaa5B?= =?us-ascii?Q?NNRyFlMIu3O2IedXIBUl3uR1DR4Gw0HUU72BkB+RLuhW6s1cgkFSdrMvq4Ra?= =?us-ascii?Q?2mKp4NiSb0xgv73HEAtf?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d14ffeed-16d2-435a-77ca-08dbaa4bb903 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 17:57:20.9208 (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: DU2P250MB0287 Subject: [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 Cc: Andreas Rheinhardt 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: 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; -- 2.34.1 _______________________________________________ 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".