From patchwork Fri Jul 29 08:22:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp735386pzb; Fri, 29 Jul 2022 01:23:19 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vITRF49PA94vEnaf0I308CQQF50EQCGOa26MKFKRgKL6TNfmPMZvLcPS+QQOu5uLUrULbU X-Received: by 2002:a17:907:9803:b0:72e:ec55:b2a5 with SMTP id ji3-20020a170907980300b0072eec55b2a5mr2045335ejc.347.1659082998370; Fri, 29 Jul 2022 01:23:18 -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 xa4-20020a170906fd8400b007269fc5cc4fsi3252207ejb.212.2022.07.29.01.23.17; Fri, 29 Jul 2022 01:23:18 -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=Rsv3T7Yb; 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 9A38968B9F7; Fri, 29 Jul 2022 11:23:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2015.outbound.protection.outlook.com [40.92.89.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3F7068B992 for ; Fri, 29 Jul 2022 11:23:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dp5m7TixlLJluSv2xGTaLs7HpHRY/mqv0rRWLKMp9c4rifKXX+ksEQerN0nSaJBWOmosdA8tDyqHIqpVXkQyeyVEVyIhe9UAHVY7Oy4jwWxLcSllzvl5qH6ybEOl5wPWs8Xu72V/VOZay/b2azWfw0WYusoCFl5WnEwbvfe1DZ0gaOCYdfqJN50jQkfhkCddzXK6mM4AIdcRcnARcq2qWlz5vBaxBaLXgT8EWIBlsWRUZ3mlDtXx/jsMTkjZ1lY7Iz9RaSvJIZIVnfgcgxZ0w5GKpOE7cjh9oVqNKOiu9a4njYatZAeg3/BW5W/NHatw84ZC2CDG5OfDiN+aAZgXHA== 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=gm7xm+RprOccRxFnw8tIJCuGoSwMy/nnxhQu48s90rM=; b=GpjHEPPoBjCY98Fl+w65r0RWTKOHx4hkDou1pY+RS9LnpjowezmTiIhBg0H7MlHEtE+AvNfOeag9+vzDsbftA+BHLu1pPD4dYpZ9eN5aKkVvStdy95SpRyIpHyzH8EJjpbz/WTWIgpuzvJQzuDs7j3CKIkZOvgaGYEuGeal3U3TBBec4KA9mMOASgkW2iH8d8k9W8BP6u1YBeHEEFB9wkEmB62XQna9U16+LtzRb7u/6eryFs87ziLLxNiMKXIkqCXxcBKbFSG0aQHQjXC5YQw5Cg+VDjEHfHf4aw5kGulG18Uw991E787hLMFkqdazx2j7/rznbOYiHL3un1oacRw== 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=gm7xm+RprOccRxFnw8tIJCuGoSwMy/nnxhQu48s90rM=; b=Rsv3T7Yb4vAWFzfuqFRhsYXr4WRLYYTd+hGMkGXNzH7JHkueWdVAQQ7ZAPsOh9XyaK6BepzohwImP/nlUdJfE13VCqnmxA8IY6Ya0tOS5bpJxKJdbWD5AjJldzf78vBncDswpfFFhizxsyz79eBmzbw+X2zEggZPDsVFJ3GTyYvAjnaCo/KgMMcNped8NDCpK81KH6DG1f1mzxYai3DsISZbxi9ogttUlqTgi6jIMqZseZXymE+ALG0FiZBJ8KjdGvTUHdVkOxtlntB2BwhtYpbLOglCwa0084mqHisV5awjQGYhjQ53Sf9ZkBxtILeEpSFdTf9+7Q74Jk2dTt+rMg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VE1PR01MB6191.eurprd01.prod.exchangelabs.com (2603:10a6:803:10c::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.24; Fri, 29 Jul 2022 08:23:06 +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.5458.025; Fri, 29 Jul 2022 08:23:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Jul 2022 10:22:54 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [aamdqW2inSOGD20vd2U28FdW1vRdF9Mn] X-ClientProxiedBy: ZR0P278CA0129.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::8) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220729082254.3575731-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2962ed78-59b9-4b0a-707a-08da713b8f35 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTOhQ2NjSgoe5pu00/LkoouHoInlYWfL69sGrX/eljL2JxkpiC41xLSKVDgP0NJDRZzBKTPIfrS02ArZIiVNQ7jMIubd5bUFoCXR3OWdRVUJgM+IhtILaSxZzCgNfxalsGS0Im6X6ituPad4f2cic26j4Q6gv/r9reL0UBXaeqzs7aDGXIB8GryGIUR6oSH70nkEIjS7YfIyRyJ9xl53OInEPM7iSszkPh2j5zxOeTD6RJhB2ITQdnY7WqTzW/PGWX5cG2K3o3HUVK7fudmzoDIPxnT3d15VFfa5k3DQeXWMzioekeaAmonDKW2NNqzqgFNagIxGmMDRWX/nRqnDBKUdqk/2r0RSTkJ6ZxIUqnbDyNZfROOQfMfOQPd4zyrKpyItsU/ic4daEJIigQWb3S3TtBkuKLeHHUu9vack6eRlzzv1EIgfYr71EQthmISZvqACkpoAAjD09b8oF4OIpPuwnOnJnjv8QKLhPIVsCpdIOI5uU7iqBH81sr4rFBOGny9ataEHb4sHQNee7xxBRGJSA0/AeuPk1la4gArTvsILtXBg/mEhFcTat55XMYBshdTP/PoAnLwj9W1fOxtCL7SSFwWFY05f2jt/QcG1PD8lhCrPSJr3DW+Q2BSjbUM4cKCXg38daGzT7WikmrjXPAjPRsZYyQwkLWRRyQ637BvAf9Cs/hAqRqrWHhvxDNs9BD3CXtjWztFXyHfhm1QeTO/xamDFbyZchlzi59i5anxnLyCKkIBUr2Oed+dzaEpMxg= X-MS-TrafficTypeDiagnostic: VE1PR01MB6191:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xWosszD+FKoTfxUl2h9RrSSyhkp4YhsY2nMr8/uXM6CRFBz33jUy0Qcrq/3V2LKVNYqPTFy0CyV+FHEBMHyAksG69HQpBWfCCeMscbgV6HiTG99zOYpuJl7hToGQfhI0n8PHnltc3dCyRHR8UYidXxSM41rvWQHh/TqKm+EClOH6NYg6yKE6/j/gEhCJqAHwQU47zyuHsBMCskrU1XXFpPMMsMs1/vTwXNYJJca4BQJTHKQWoig/hfGzQgDi7cXR+GDaUoDMZPRh/OyROPDNjPYXrAGVMtjFLljU1DPft4MX35dD+EoYAtXpfXEsPb0RoNCe9c6WN9zywW2+oi3hBj7hPeEZ0rSEMwl5ltXWCaSA0iSuC1GcNyFJsWTHOP9tXulxTVx/CgnDSUjbHI8dC7vFCSpZr9BhCPcEFc+jS/B8m6FyHCgPsdjTVFCDOeGJGXMYvakBnEVXAqwiVOPwM2U8bc1YZHG09xSp4zT8lBwQebUrSYAywm1OePZCJ8kRtCvlyWXsU8/jeURry7mfz/uaxy99/nujk+dGoWA0IjN00Pc0lA9XSvJkNrb5roD293rIHCbgkfh6d2FHBQCVTNeNNW+rFg3mh+amXZDlWso4bJJYOCYZJIhwz+chiDkjUIuxgLLglV3Ca59lKpsCJzsy8HAAu3FabjobqFcqafs= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8dVAwuB3ADqRHEUbHmMtKNk+YFneySnOU+c30xg/yagaiL5+6xYxXKMMDRsQUAFmoZ/4GfDtI96Thw39ZtQdXQKJbGylW4KfbIdAPmjFFUnojEZ3vVHSGXrmBkt7X2wz0i+RWELRmTlvNH5cxqB6ALAIdpX6pJ/M1qLraiI5QpP15B5UKVFFRRqGtXTf8PN7RSwNCEq8W3yt0NZf9CgX3P22iLK/bgMFGv4MMeQHHyKcigYyKoexHXwBb8zDSCA8qlHB3TXclvedoh6kE1rtK5s2ENbKxrmJnE/reLrISR0yp2vCHQHBBI8cJnL0HOMJ74tv2u8WRozDVPwnTaxAUDkvP7gr3p8OWGFwyw0O1iN7HZVyNX0Vfsshsg3+l59p7r1qFNxTsJunZWgmdp+z3ggn69FXCVT7VMjuvjkkfARxY6/ngttNvJWAN8VFoOuwJwVXQDVLO1IvthF1qI9u5iYOH6xj1EgHnKcovcBl1iNMFO+DdMBtoJyfMnZcry8iBbC3na4Su94mpwKDdwqnH6j/kkIPIqpR2Jm9vOz2qDYUOu+8adWssmsD+SswdtgXe5koD1hf1xFfUwU3j8nL99sHN8FgL0L8pwM/BlS1hCB1TYjSCTOPch3k1wGH732nTInepaY/RFUGeLZ4k396CabQN1huc51KZ5dFGzIhZdicpvbRnNShpZvnApsh4pwS6+RzOfK+5/N//EXi2ceIJTgMuEtuA8O1UOL9GIHZMmwqjor2mI8hVRGF4AR8wYpSBiDyy2kBnE+i7C82XRG44KiZSdmIme3F99EdyvYRK8nmVl9okM5E/I3cLKSTiMRcvCyg4KEr+WBLnpQIerpXHdqxUSbiaTX86AAXrzeVqrIq2optdqbotkPVpFD4f123HEuotonR/5ShbkWog3WbrjO7ESn1XCUaKggS+9/5Kvvyb9O3hecZsMJ0gTEoYT0ED4aI03go1bkpuZgXRjMJI4u7rmIvCD/R7OpqRbRHoRLKFsJSo7mm4WQGqNJm9K3ZOeNwiZo5odUq8mUlrMX9vILdCqhHEk7fuAjUVJUxBVgl+7+8RuppgEgqjYa299jbanttH/BIheQY4KMd1k/MASj4SwOnGMlAiIapDjFbto3xWTwc+/gdz5JupaY8OttHOtu82gcAY2MzxI6iSN34+y1b2ug4rCiRdnx1sn9okJpjYCbnuiVS8WqwpxgTrAUrxMg0WLLFgBa1sdFokeVH2SS0W5l1x5hs+UcS8jPqwC1r3BLaw+YWARuWlkLW6wflhrRDkpntth69knK8yH0xD2B1OM9hcQ3YBxQScNqevJI= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2962ed78-59b9-4b0a-707a-08da713b8f35 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2022 08:23:04.8968 (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: VE1PR01MB6191 Subject: [FFmpeg-devel] [PATCH] avcodec/ttmlenc: Deduplicate ttml_default_namespacing string 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: f3+xnZn8bc/v String literals are allowed to be deduplicated (and toolchains are already capable of doing so), yet the same is not allowed for named arrays (even when they contain strings). Therefore use a const char *const pointing to an unnamed string literal for ttml_default_namespacing. Signed-off-by: Andreas Rheinhardt --- libavcodec/ttmlenc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ttmlenc.h b/libavcodec/ttmlenc.h index 467f35c7a6..654ca0ee4d 100644 --- a/libavcodec/ttmlenc.h +++ b/libavcodec/ttmlenc.h @@ -25,7 +25,7 @@ #define TTMLENC_EXTRADATA_SIGNATURE "lavc-ttmlenc" #define TTMLENC_EXTRADATA_SIGNATURE_SIZE (sizeof(TTMLENC_EXTRADATA_SIGNATURE) - 1) -static const char ttml_default_namespacing[] = +static const char *const ttml_default_namespacing = " xmlns=\"http://www.w3.org/ns/ttml\"\n" " xmlns:ttm=\"http://www.w3.org/ns/ttml#metadata\"\n" " xmlns:tts=\"http://www.w3.org/ns/ttml#styling\"\n"