From patchwork Sun Jul 31 03:02:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37048 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1750457pzb; Sat, 30 Jul 2022 20:02:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uMekocDT/L3LrByQdhqZmub0aRYOkNYKaTqefTV88GaDF1fQ0NmT6hHa9tu/KcZ93iqyUJ X-Received: by 2002:a17:907:6d8f:b0:72b:6b87:81f1 with SMTP id sb15-20020a1709076d8f00b0072b6b8781f1mr8196588ejc.674.1659236545693; Sat, 30 Jul 2022 20:02:25 -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 sa13-20020a1709076d0d00b00730541013f3si2167075ejc.710.2022.07.30.20.02.24; Sat, 30 Jul 2022 20:02:25 -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=nHKQpPPY; 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 1F67B68B82B; Sun, 31 Jul 2022 06:02:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069077.outbound.protection.outlook.com [40.92.69.77]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F63B68B840 for ; Sun, 31 Jul 2022 06:02:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iaqHfqtPyaQ/CTogYTiKrKhKgjfZe95AWoDzWThMTOq8dwSggb4Eny7IyqpVpWGvTR0rT/15qqi28fRTKeWmmt9eRr/UfEHgIMr+26vscYsgikIIe38DYTkdfrkVcr3oHZeqY2PttU2sWPTU8heQ0fLGjT+kxzcvZlxNpBBNYmx3LWeNBlL8TPgoArUjaCYt1hFF2Zt4gYPb/9in7qEb05NnUyrtrXtejMIyNgPoJetVE0ZXA8+6vKXrjZ19KKWIqLoZpWNJ1tMZhJAAxHXdGzFiwfEuh58yx82ZjPA1jeaE8bgCF2QAGoATosA3ik1ogen6P7m+9BO5Ds2a/7d31A== 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=kzpBWdl/8nq2PROtWHEqH91v4Og4OYUnkQyYHk7MXrA=; b=DHaDT4xa72fdcNeBDSckar/aGe3tgMPhalwt3fWUbv4Y93CLZHr+uGyvgRBgC1jVHdcNwaNzr3TAXR0pbx7ySflx3jTgK1wi118jFKSw7JGBzVJ+4n2nPBPVracPcn6BSYXlwyM28RTD2Jo9CoIMWfNyGGeiwIFD6Z5HeAHUNAAktAvelgKAjTxsHEBYcTQtMl8GMXE4leC24KU8qkvDICJ2u2LN82HbcrYXbZjcm+DTw67WXguDsA13IV9iWWRk4OYARTKk1HqoX+KLo9Udn8pBd+kwPeJkn9eZ0Pwa2XesPXyULmF76Ym7AW4+GKalqWqmP02YkLfF5Y1pi3IRcA== 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=kzpBWdl/8nq2PROtWHEqH91v4Og4OYUnkQyYHk7MXrA=; b=nHKQpPPY1qiF6qDjVz2l03e3pCJ2TZ/hVEMo2iOV+/w+qUnOivhbAwJPnDVuWoQgw0PTjwMt/uzn9mZ8Cr9nLQnMwA0OlbHxrXOPDciBMOTxpSD+12AYugYTVW2pP73i9SzajVzNkz1odLUJdvovOEFrpd1l3ADQAsUYp5rHcMY9KWlVRVStYDq6Q/yzkPamHxYuTaAAJmWwwzGYt8BW9w+4MqgDK0hrNEfXyeLNCj7gr4n2A4aze9XVSVmDhRSObOwN+vRzqRpI/D8XKH+Xq1YJy3sI08LOQEhNAbs0HhHCmHngTLuEwL/7RabTkZh6QDnzmfYgyeeYei8OhL2nNw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR01MB3705.eurprd01.prod.exchangelabs.com (2603:10a6:7:96::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.11; Sun, 31 Jul 2022 03:02:09 +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.5482.014; Sun, 31 Jul 2022 03:02:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Jul 2022 05:02:00 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [FUL7tEpsOsWhnthQUlvS738Yw+kczIPQ] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220731030200.1208586-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd40107e-296c-45c4-29f6-08da72a10e9f X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSqtDrhWxOstfcXqUVYYLGq1JDOs9JG4JjJt+BTZjxIP9igKm40JXfU6+p8gb9W9TDLxNeqN4K+ea7CWeYDsc6uRJbE/paa4WlQBdvutVplj+uuPXLKYMqV7aGbZT0DQA6TvUgYDGDmbJfMV0tcQXud133kO+1UGOSHCTSjch5OPzhL2GjtaJsPtJz/FfKDoG1+UibHBSff+vBSXMmIbYghbYP3qVUiyT4KFkS8ZyL4FG1TOQOtPGx/mELmyTki1wFZ60f6/DRlo31GaH/waOSkbLHEGU3tPZY+b3SHHzgCkas71HzHtAA+xoT6MJbVbAM/XSaVsqLAvYUnHGbQOIF5/6S9UVgwS3HjM4ytiX/ACgllPnk4ttnuUl8+JKV0b8z7XN+TR9OBGYNdzSONT2Xlnla5eRueUcsUExsIi59sLh1gI1W2igyeU0KrH1iurcdL89IHxzN/J21e8lAHIr9+shx1ndEkLVii9jMzFsvAtvX0FOFbBuVln8ZL4joaM9zZ4T7hjmaaSBfNIiMmPwLlNUWqkZksyOFCh1EyrD7Csq9NLIQ/AsUXghcQX3IdecgIrIeOEupVIbXEG/NgYFbaWm2+keUKuUNrqrPZgCXv8RIPotWIlXPcf/k5NZPxHoxH8BUKf23NBqwOQbYdB5cBt3Er15G6EWjif+o6KfRCdwoerMLbDsBuKlx7br/oSPXJahBM9tJh8T35pa/eR8EG+WVuZkgQLiMRzhRZmpwJykec1XWJJdOPllLwlN+jhgM= X-MS-TrafficTypeDiagnostic: HE1PR01MB3705:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O6y+0xd0XvfHwsdQ8BlhZFQYUmqH4CWM/LuYLAysD6ruJbo5RCTK4W1h+gWNdX6ZuPFotjWUZm/kyfDdGooKg+puzBEWUyPD072GjTfMJnV8DLX+fV/tYpPuC7vsO78Ux+50W9aLZURJu7QaVtaZmV+ujQ9eqVhMhfP1YXNr6ZnWz+hG5K9GXUe1isCuERJVVx+vJcL8UN3DxIfFkPl1vs0iITAxD6lbXNJcF+8XlH6KtlkQEm2Wq6cEYYzYxkPjshOwJ6QofZ47cjUotaWa/tHDqDvwp3FF1SlpdtHd4+djSDXvhdF0w3JtuAfkEiyVU3TPgEQSCsddHnoIlyve3S6ptKzPwj3OFtdFiHrbtjIOgEIw2mTokOwIK2C75ZYc0+Tlid6wO+pYFt31tYBR9dKCr7pwcWNjsl1kbawqKGJVlAovEiB0m1MAzC05+bECna/9ZyYIIG0lY59vDWgM0VYcYc/8w2gajbkoOSRNxEL5oqvbM2mZl2BSXJyalngn8mizI61iKGkvB6tkXpLJt1BIxwcBUhq8vKsBhuveVDlDedze3o2bYNYT0VH5ZvIEO6uLHJ1Kpp+/TSSI5g6Bmny1mOtJ1LI2Cg/pYiZ0y+GWZ0CHC5e6uEGpO8OlNAvsFVwENTUMrXggaWXZVKqlTE7GKd5Nlwp7G2c7LURaXGw= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AGQVF1RAHdD70kkXhw77rLJJIP/j8cbAydqKUv7pSTmkh7RGL3YlbBmpu8Whys6wwQCdvlHC15LLwc3+sP4uSbyOeoYvvyXXLs0XZa22pTCQs/AFMz8gjJWvSZD7Fy8AOSitrj18M+oX4S5ktjoNMB+ei3p6ZgF4FXid9PZwiMK3JFiPvEjBdIULbbujcx0aik7nQgcRgYaWqy42x1ZJ8INMjodtHMONCkQJkbbM6KiRdOrfLo/UNkhr9UoN/r4t6bo1PmIzpFybVBtaMLq7R4bKRPf3N8QqsBDbdu913fJ3tU6NGU1qji0QumFhLsYqDgXIOgykJVm5K+4rOfmvVuYcdelktJDwDFvfKzuyVT5qilJEBRtxEqoy53T0WFGKlQfpcXJMhbVH5Qn54Y1A0/nR1aeLrufNOGSl0ngtma2LwEIAcX+EtraFxfCvf9JQQmitK//EfxajRsHVCLTMLdBRPSgG4cSKqj0OBF7M6lQEo6OpPjYoKOyjIaOvbdAZKP2Vjo2CTGN1g5YXAinK050JBWcm2Lu7B1cHCArkRjjLuXVUMsrAXCSqXPjEUFw92D3S7zx5GSlIBRH8n/x3fCG71cgA1JtjsvOADbUdsuWFkPbAM7KnErCg/baYKnMFYVO5rkf1FsARNGaMJ7sBx01PsIg+QGtJU0/hOqEYGZpzu0ocfJ7Ga+gxcyoY/XpKVOfZVOxBzjOIRhWf+uovLX+Lef7JQhKOGJSMuEOhZqV3E6FdbDDOgzufebTlUysQmanayWjMi1guZJNkHLMbYcymJqkb4diUCRgPfJJ5fvaeTUQozMRXe4KtpEPJ76ZEXWLTbJVmARICTk8YECvJqA9FocSbu3gu0+/XkLd2GHYVBtjpTls3qg7ou4aPIRy4bMTVwKicMPTlbXZOk4mfTsNeds8aEFl8GPyAC4W9UNU9ztbI65uHA2VLOvkpMaTo8uJhKR/0JSiiFjRSDaJBveHDoN6C3RrZUgu8SHFWgV5iHULP2VyqBtP2Bt7iuJ+tHqBADCxnzDIaHV1NL+3D47AgxfA6tpnD9HSjXRr6bIwiiSZ8Twap/9kKGP57Irf6Vwtxa8SDew2LmL65BOA/bmZetGiBnAGgIVNAncdYVOgqD+6yOFrJj31EZt+prWLH1ESmDTalnF5odv1Pbtzs9va1KEsFYu9v85AJhQSOw+nVzbHioUkgaoVc9AZ/hYzXkpE4jdXveDp7s0tSQX/Q/U3IDElFweJn8rYX/AGdN57lFEo/6oqHKPdZ+AKKWI7EMJHssAWhlPySwfkX7B8P2YU+uJqjIC/JncMrQSdGb2Q= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd40107e-296c-45c4-29f6-08da72a10e9f X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2022 03:02:09.0553 (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: HE1PR01MB3705 Subject: [FFmpeg-devel] [PATCH] avcodec/ttmlenc: Use string literal macro for default namespacing 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: CsuWULtR2ow4 Fixes -Werror=format-security build failures when building with disabled optimizations and (according to fate.ffmpeg.org also with several other old GCC versions). Signed-off-by: Andreas Rheinhardt --- Will apply this soon to unbreak FATE. libavcodec/ttmlenc.c | 2 +- libavcodec/ttmlenc.h | 10 +++++----- libavformat/ttmlenc.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c index 2a0be99028..7a09c8fb5e 100644 --- a/libavcodec/ttmlenc.c +++ b/libavcodec/ttmlenc.c @@ -315,7 +315,7 @@ static int ttml_write_header_content(AVCodecContext *avctx) } // write the first string in extradata, attributes in the base "tt" element. - av_bprintf(&s->buffer, ttml_default_namespacing); + av_bprintf(&s->buffer, TTML_DEFAULT_NAMESPACING); // the cell resolution is in character cells, so not exactly 1:1 against // a pixel based resolution, but as the tts:extent in the root // "tt" element is frowned upon (and disallowed in the EBU-TT profile), diff --git a/libavcodec/ttmlenc.h b/libavcodec/ttmlenc.h index 654ca0ee4d..cbed6f63b3 100644 --- a/libavcodec/ttmlenc.h +++ b/libavcodec/ttmlenc.h @@ -25,10 +25,10 @@ #define TTMLENC_EXTRADATA_SIGNATURE "lavc-ttmlenc" #define TTMLENC_EXTRADATA_SIGNATURE_SIZE (sizeof(TTMLENC_EXTRADATA_SIGNATURE) - 1) -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" -" xmlns:ttp=\"http://www.w3.org/ns/ttml#parameter\"\n"; +#define 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" \ +" xmlns:ttp=\"http://www.w3.org/ns/ttml#parameter\"\n" #endif /* AVCODEC_TTMLENC_H */ diff --git a/libavformat/ttmlenc.c b/libavformat/ttmlenc.c index 896fc81958..fc8069f7b5 100644 --- a/libavformat/ttmlenc.c +++ b/libavformat/ttmlenc.c @@ -91,7 +91,7 @@ static int ttml_set_header_values_from_extradata( if (!additional_data_size) { // simple case, we don't have to go through local_params and just // set default fall-back values (for old extradata format). - header_params->tt_element_params = ttml_default_namespacing; + header_params->tt_element_params = TTML_DEFAULT_NAMESPACING; header_params->pre_body_elements = ""; return 0;