From patchwork Fri Mar 15 11:46:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47097 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8c91:b0:1a3:31a3:7958 with SMTP id k17csp183466pzh; Fri, 15 Mar 2024 04:47:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWj9SNc+B0fSIx/DrspsBGZ13fz0jb+vyDPFHWg0vTyNDwgnrl5uWcJv8Wnj/pHmMJlTW4UlqIvB+xIG6cusBEqHO3b12IU8kcBsA== X-Google-Smtp-Source: AGHT+IH0cAQInMACnptDbwRv4zjp/+XXmNncN8V+9hC+q8eMGWEbjZldtht2tfYEzXvHBBwdWZNv X-Received: by 2002:a17:906:16d8:b0:a46:5150:c6ea with SMTP id t24-20020a17090616d800b00a465150c6eamr2804449ejd.21.1710503237918; Fri, 15 Mar 2024 04:47:17 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id oy12-20020a170907104c00b00a466129e1cesi1618624ejb.810.2024.03.15.04.47.17; Fri, 15 Mar 2024 04:47:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=Vnsv2Oel; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02A9F68D130; Fri, 15 Mar 2024 13:47:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2066.outbound.protection.outlook.com [40.92.66.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F28F168C7C2 for ; Fri, 15 Mar 2024 13:47:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XOF11MH4GF1tdcNsDGIL+HNlJBpiAKWDSWyhH/n6IORMwrKQUIU5q4wCvgg287nJ4b2GLyL7y6HeHnyfa3ev0aW60pjaABCOQ6cxiEAhkJsDDCwpAYQEqVVH74LrNJEnUp3GeJkW+HvcOV6ZD83NmEoOysqU0EYAIXOVqEbCgI8VxIyJA/VD3ivxL9pkCnzJPeZ7T9bzJlj0Nw3OIiaUFVjns3VOSb6xSGjhTU0sHFNuQ4/Z80NbX3Nm+m+etAFKzD1hFWzfwBj0zqvMDsx3X/8Z+5s/QakuTWUOeTpeSZn6WHtwtC5I4HespptvV7Yg0n1mofTbZ5xZT0owkTD3rQ== 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=mM6iiJ+7M2QhRKV5ZL4dv7g4lLSPZV4KEkcRUjiBME4=; b=RrT3dZjnhMVK4VDdJx0K0iPp/jQvRuZMCQ3vZrS0VH8wp0VYSo2UJAXonpnQDjXIot9j+zeKqvgtt5eTMC79xO/y6QDc6bVU3lnjYZfI8WmpC/UuCIe7OPmAaZhhjAV/tGurGnqo0LV++P9U0X56lV9yazV4dsGDCedmDxk6pLwhdeTsG5KbfxBGJLPcDchRyuDg6k2+s5PaTMzWzDSVaOtbSALvZrHhqUPNDS/qvBUtXSeUinznAqR+qJ2We7x5YS53iML1/EhQ81a6l9oY3542Hm+NigDzdYYxQlqsBdeFoGkriwXNXlR7HvSAZMIa2vxD/SEG2RRn7NHx7cOasQ== 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=mM6iiJ+7M2QhRKV5ZL4dv7g4lLSPZV4KEkcRUjiBME4=; b=Vnsv2Oel9/YmXtCGlWxh/Bv4f8PFveFDX/9XKUEzYAiLQd40dWC8jW2fLLQNvceOIY5WDGg0fZ78LYK+czYbCt6E930gQtbk0bMlpib70HwEeQyFSlTp6wfEWjJagvIPmgUd0NyJMKQ506/ETMgBFAhGQEtIZ5HhzXwS4RIHJ7AkV7epMGGlWZlk5om3B2jlnMHLlE8DdV08zpMfjsjVPSqeav/8FbDT0TMxHx72cao0g9JhLjwd1Di+7pt9sr9ioIT9g5sknSf5aVqSu3VVpWSQel3FsL6wuUIAd/umElLV/1tSA4ggf2CvZgBsH/dJvjJjy0vlqbs5NMekfHYUZA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0465.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:278::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Fri, 15 Mar 2024 11:47:06 +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; Fri, 15 Mar 2024 11:47:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Mar 2024 12:46:58 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [SZnSUZ83obHmVF1TexDT9ek1aD0WkWpPkefKpJJ1ujA=] X-ClientProxiedBy: ZR2P278CA0075.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240315114658.3835503-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0465:EE_ X-MS-Office365-Filtering-Correlation-Id: 2440e1d9-ffa9-4c95-57a0-08dc44e5a39e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YlKFiDHEQLHwQGogrTQLONmrXrT+eu32fHJD0RTwNKEo+KqxjThTEYi3Go+TXjBlD/A+cGDkA5TAt9vWaE/X2yVWNkFtWrwpKfFOOIsbvxRdN8TEy4in+G2+S5MEDR3Kjy5HfViUDkwz+I5bkVGNgD2PXV38rKpizVBGkF/4cmfI5VA33lI0+RUoP9Jvo0AWlQrr1/CsAQIBQXbB4YVtgXwNyvecWVbxkzD71mZ7jZ/4JBpXZBnf7YnRH36ckdhYsBPArMpGR+wUhvVD4jkDRNkOjsxBQAs/QwM1yjiCLweHbPLw7Ai8I5Vr7D/vV3DUBXJrpCwnoU09OKmNrxbc/fIeB8DNLN+BFRVE5QO9Gdn3e9gmgs7hH/I+P91LzrYztLP6l4oCNhpsNcayuuZlykpR80hdFtKjeiuEYxCgzSFdXQwXxEW9DpAKfaxbYC0Gigk6DHRhIVBd05cxBilWG/hGSPpuLNXGs8QcuCtDsJzStvGKkIDD48RovbbatNebAAmw01gMhL4lKKhUX4g/BFlzrMqkZvdMaMTTC2ILm6UhJWi7CtMo4TkqQMVSt23sYSw91ih4j9XUCufQLwAZ9JGNhuhkdQuQKU4C6Cq9z4ZaNJ//a85VumJz8ec1qxEq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OD+RPAnTLNMD5zQzPV28ifZeNdgJwGYPDB6WCcUC4c4ublIsOvF8ESMaGFcEOmP0hDxpF8oNuwQfNXUPs8hmkA7PCJwZnWPWy9BGFacy+SslEo5SsaM+QCBEhafxTdtAno5ElAzjV/rqLs4oO4Rn28/aGLyBDwfjF5YMZ2Wb1HHr0TvZUP7uVB212djx3Sl22M7J478wJngMTpofbS6Lz1jEDUcrlnQ1nD2wFbX98uYX7faUqdDU9toEVcGHV/d+negLJOaIRvAvV5qFJ4yDtUuOTywOqNOfjx5N17Z5bY2watIc5TyguVLILP+oZjCmVJ6CsMKgx2h8iRL6TLFuh6kpzTsD5N/vqTvRKxBFv+Hpp1S+t4kMmyLg1EFSe9HkVNJLuJLPoGK3gsCgTuy5lmLk5NKSwTBZLW3RKF33EHDD0OEXSaiRZhRpiu+01BWZKE3sVTLHQwkw6jG+iwmvoqZd/F4hl78gEuB7yNsOqj2e4Ow9QahMB+lF9e9k9erZrZKe7aIdArJGlwPvnMX6E4q/jIZaW2Tyka8mvzAmrSUPAJWddk3g1oTtz/Fy4EHAuDYlmg/sFjxnf3Edl9fPh9sV5H6SB3QK/1rqqvxKc7QNYtAk360rLEjvsXnxKgD+PMSR2khHAfuMZ8OFWdorbsF1FJjvjb2MCbZ2Ou59PMmwZR8u8EvdJXAikU+LhrUoDteT2BVaD+kAIqsvH0rtNIx/a5e4f9Dg6fipc2Q73FpMLP7VH79Y2alvbWHvnuxSoSfY+ujZhghD9DQ5cfktrWhyVhjyG5RyjFSWacna5XC2/7ukKXUrOPEZfdauUva5R1wyu35o7IQQycR7kSZ9HRDAfLZNP3iu37CDmDNv6ubLFrNOG5XBTOzSJ3kIfiDixFM4vhQcpZTLy7vt+LFY5R4P1z+9JjGZWYKflq7P8v7d87IVMUrPjtNCNervZt/rByRLuuFBurytclmSEIE1UTTqt+W4qSe+TsGwPrxbI75phMwRK0vnmvbMZiTn0CPZzbLoWvcUCq+lx9FNRMrDwi+WFDctiiDy3AXdUx42nB4Xm7jGww4jE6gwtN6vwfh/POMQ9C5rncVHUWaJz2nNbIC+xZvAWvAvTes2zE5vbGKSMQWeIuH5/y1qGpyq0OpoaR/4j9InTM8o3Xd6rBgfIzIRUb4FvmJ1nnmPf0uiOVEbyKaGLs2Dv9lzmHjpTJL5/Xz2/JJpfYG3cvJNOJS/NpHANUzgUvqXlvdnGljMDlP866uLToXNy+Z54psEfbe/t7TbrKActJ2fkD8lXa/+zg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2440e1d9-ffa9-4c95-57a0-08dc44e5a39e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2024 11:47:06.5222 (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: PRAP250MB0465 Subject: [FFmpeg-devel] [PATCH] avcodec/ccaption_dec: Use static_assert instead of _Static_assert 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jJY77zPeH9Hc The latter is not supported by MSVC 19.27. Signed-off-by: Andreas Rheinhardt --- libavcodec/ccaption_dec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c index faf058ce97..d8b992bb94 100644 --- a/libavcodec/ccaption_dec.c +++ b/libavcodec/ccaption_dec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include "avcodec.h" #include "ass.h" #include "codec_internal.h" @@ -180,9 +181,9 @@ static const char charset_overrides[4][128][sizeof("\u266a")] = }; #define EMPTY_START(IDX) #define EMPTY_END -#define ASSERT_ENTRY(IDX, str) \ - _Static_assert(sizeof(str) <= sizeof(charset_overrides[0][0]), \ - "'" str "' string takes too much space"); +#define ASSERT_ENTRY(IDX, str) \ + static_assert(sizeof(str) <= sizeof(charset_overrides[0][0]), \ + "'" str "' string takes too much space"); CHARSET_OVERRIDE_LIST(EMPTY_START, ASSERT_ENTRY, EMPTY_END) static const unsigned char bg_attribs[8] = // Color