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 B1FCC49122 for ; Tue, 5 Mar 2024 10:25:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 965C668C119; Tue, 5 Mar 2024 12:25:17 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2044.outbound.protection.outlook.com [40.92.89.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA76F68B5A1 for ; Tue, 5 Mar 2024 12:25:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EbcY+wW8me8mmy+88PfQ1FiE62VjmbeTCCEGYQVeNcU29T6mAXlHs/czQsMR4gF1XLfmi3wi9QHG/RgSgnb4oIruNtnmG/f1HYjD/ddS4+/RRv9/vmA1xcNT5FVFg6V3o8c9Em5jRxmuma6tQUmQXJHaG9EJ2UXvT6tR3g/2p7DI7oHKMpBdxw5G1pYtyJ4VX/OXfCDHSU2lOPxa7Suljg5WIQZRe3jXSlci1Ox0OqGi/LrwGxbCgpu5INP26JCDaxVRFSdk3lhJtIRXKeezrmrAg1nZH0WgzAOcIeVOlQLUT9QCbizkBOy2dCr47bYtd/z2LQvRHeinYHWIusMkAg== 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=TQ9BHKnXAfdRrEVI4o9Kwq3oSQYzAaGN1rtHgCFqdF4=; b=BckWtZoGVA85cEqmIq0aay9Vcu9FSnMc+SchzfNgkZOsVJEW/LPRS2yL3s5C7kcXKwX7QCUSvuvuHd9HrPGCylR8HSIe71GLkFwZLRroh/9SfVyYBLVQStuOKJdsfu+d7hYnHADfNEBMXHfW33+okMdhEEB53FQer2StCtTlqnNSuWygu7w2w5J7M43iJ41ajQg3NB/7PYafW511hrR/qgJEJaMzl8vgcfMriYAPsgiPLajVCjVuIYc+H0HyqMwf8mzgC8ROJ3bFvDv+3ucEcRNE6hIPhvQzjH0I61KVlAMPmKYgCR6WnIUW84Cw0K0ciMHBItxpL4VTometC7eQoQ== 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=TQ9BHKnXAfdRrEVI4o9Kwq3oSQYzAaGN1rtHgCFqdF4=; b=GOUqpr4+0bac3nv4W/uq22cX7rtP28/EJTyFMq3oT5ozSvEOOuVVv4bxd+mRWAi6LU/AK+0l92A1unePumVLpi57CLHH5y92QOoYk6DVkgwvLeIw5JET7LGVdbycA3cxETjY1n9+iLWpI1VYSxSmq4PdHl54Cuj2DRAeA0fhDFGmFka1L0A1ryTLimi/Mwo1mIMET7jtgfO5M8U+/w8Gi/lKRPKe0L8gKqz/+fm/atN+0nCidBzLKf8kqf7kzCnOLrAQOBcMyiJevR6BYZ6cAPT99vGYUugc0BnJqUL806gUG6jHX+9QYatM/p8Xx50tu72NMRWkyg9B9mPBM4oJNA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0464.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 10:25:10 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Tue, 5 Mar 2024 10:25:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Mar 2024 11:27:00 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [Gfj4d+tjipHeouamM/o1uJGKyJ6/TErwxNu1ZPVZesw=] X-ClientProxiedBy: AM0PR02CA0193.eurprd02.prod.outlook.com (2603:10a6:20b:28e::30) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240305102701.2230512-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0464:EE_ X-MS-Office365-Filtering-Correlation-Id: 496ed09f-a693-46d5-4e00-08dc3cfe8908 X-MS-Exchange-SLBlob-MailProps: 9IecXKUgicDLWPVS3Aeq9SkbV4Y2KPnMOF6Y4PYhYxBsl3OJc3F3p0sx8AUCewu4eAZYgxzZROTZHcZlEsDDu4Zohd9fMLNixfx4lvIp2hww2cRiBWOPcxgoTPhBEtMT841X3QXKp8Ghc77gM/0VWF0W7oPkKKFe16/SmQmEllqM/ozsK2Ht0W2/IgT6EoS7BwumJ1E+upThVGX9ErWPkqQv5EQ9o+SNzQbuwPNOUrytrfQWDO0g8JNmxAg7dlnf7qfy2gVayi2949V0+gmuUTGoapZuY33FdNbA5vp5Qq75vVfqNgS9lyZpMm5mzt8eRtOL+jKmf+xNOT3TExcZff8rXuPFGiQg8WKBShWzky2QyoVQ8p6wUY0KBOau4NhKnr33r0hRkHoEMybaBSVoS68HN8AwyAd/7hQlG9zqW2L3GlAGYWxQaudDW0m+pmbs7zCRrvdlC/o3ydVTH/Dkgo/LZEPHdmzmsSuId7fLQoW+aWKb1d/oFDl1u+9qBrRxWKz0oMze7XAW1xGiJZxP2RVj3y+9OHyzjj8frlpFzFg/1bnH+rtBytZCBoAoiaruBtDIV+EGufuTfS/lYlupZjJPC85aLiPMgCugL3AX7GlR/a0IvYdJX11P7vQy5nCI5+YYnAZbMMvqrQ/B1gBGP5pzb1WgfihprLswVF+WV5m6cf+dhLg+/S62nL6jvMBA/gGYFQ5qzLDG5VDCxewOy245m8sGSlvHBRNqnLYQuNfoOHztgHM6Yg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kKqaTg3gnM0NWeUMwd6x8r7ncRF5N2zTIOWYcE/zJHwyGkXdr7ZXqDzM2cM3UEdHfx0uob4KjUQ/AkMcvMjhy6as6JutcVknBUWEL1YWX1gUNvGCKbk34BTAbUx8X2Dd2oiLMJIiGM26eFqxcjbZ4DBC3umPkgMAgo/3papr2x7FeADIZCABFI0xSsxhBzOYQC9oF6XEmXG+bZ3B1g4YihnhpzngWQK9ePmR6OafFW+UzvGqnfbiPt2ulA+bHwJ08KPiMHzIG/lAWW+TJG7zekDt0goA0bgpuYQ/RTSxzrFl9rNx0kO7Q5xWZXnaePGLnIYqbifttCGGKoAdBN1jgvV4g3vDO/iv8W0o62U4dcQi8oF7Xo4+xH4ktkkjV/DIIg7qgUfKduChebh3mAblVwgCKMYlvLfDzmgQHnis7TrRKht8Pil0tIRuJAkvu7N96CKqkdsb7KqND9QBeUakXZtq5wpHg2DsAZtTHjpXyO2evHSVDcjpEExTG5ey/Yz7x4VPeFggiCYTV3KEfqmSlvNvy6u9dIhU23PuTo4GpKx+w7cNfOqJawqackovJDoY7IvfJMIs75SJ3b1kszuQH2s/cGSwsY+dVT75dMU1/LorjOdwqI2CGVihMruz50gV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DrPYqQtjnic7w2qk2PbWo7D85bgPltJg7r/5W0DRdLn7GW9bX69D5Kg2vO/9?= =?us-ascii?Q?vztMFOui9HN+y8NCNPEinHU0FtSiGZ9JxUiqOcnyAKbiAwL3p6RQ8lBtWILS?= =?us-ascii?Q?qtjSTj0oZ4H26zuCPWMB5Qhzk+DkWJ0tznjS3y3yDyrV9ag+dI7ocbZdwCwF?= =?us-ascii?Q?m8ULH80a9816ad1EPQVAicOB5rYAyJX7Vb5vCT1AvGNxzcNlF/NtHLhYo0KN?= =?us-ascii?Q?bEfxbCcxQrDXMAJ0kPK2HEWHgdDTGvLlH6QKItCKfP34gGWMhgPJeNZf81M4?= =?us-ascii?Q?eYC9lOhKQZKqiuktmBMFjWaJNs+Pnh5vYii/woqSGUy5w5RSwW4AUOy+pGeJ?= =?us-ascii?Q?yWKVMlO4bxDrE0EBEO7jPuHhpVyZuTWYbUQ4tT9XCSEGUtjN3Euy65EQD5PW?= =?us-ascii?Q?duSQO/qXkKuPotJl8jdXdXWgyxYwwVFSE8aaaQaZCLlMTDDYs9Zeli67+wCr?= =?us-ascii?Q?jZP5FGISOeeN1NPvKXLaYAe9Ar9SzFhazufWCdH7KZjiBiUfq+3K0mBCCfZd?= =?us-ascii?Q?I1Xc59Qbs45/RXT7XhANAn61kmeQmQwL6bdN3ui6/W/5z03oJWQv+9dQQF6U?= =?us-ascii?Q?k11RHDrTBmtsIl2JskGgiW4W3ykASoKbzYY8RkoEuzkZamGf7zlxiQtX6r8y?= =?us-ascii?Q?9B5TJt/6UK0oAb5xSeY75v0EsxrZjh1/OR/ETdR/4wlB3M1eB1dYijQeKODP?= =?us-ascii?Q?yhXYYP9582YrqXXwL2ohsAgygPV6xX04dR7bThKVuFbLAmiEQftLIHK6tPJ8?= =?us-ascii?Q?yyCENW4IRvt5pauJZLRSIE5mL6Kt825LWNmolwJwM7+WoBaEWus7FC5Pmozg?= =?us-ascii?Q?5N1YyOeIornioE0Z8Dp5ewQJNLwNTW0dh1uw+B/O4grPg9TGTEsGAU+KSTrv?= =?us-ascii?Q?6mT7MWUfrP5rFUbqUCLbbpB6EbXdOl4PxoDYKlDJKhI45iyPqYQ1sWkVF7/G?= =?us-ascii?Q?W89QXqdORdZevbDCT0RUlbiXFDnI5gq0UWTAQh+K1zYT//kL2ObnGShhLW8m?= =?us-ascii?Q?wBzT3/p5rjCmxrM/WVj+FDEr+VyTBn7+7UQmXZOoC82oRsgkpNz+SA61mlcG?= =?us-ascii?Q?Y5jx9OBYIAn8+YqDTVbQD2X8cIYucv07avt48CdLOrLh8IYekaTBbXJejf65?= =?us-ascii?Q?gyqUxn8BZMDsmT9Di2SCMHHf4/6FrmjsxiE64WNjnx5k0K1NiX1xfgT2rF+Q?= =?us-ascii?Q?B+OgRf+78reutGgUtODX2ylyzXXiDXPs62kKg5bD1WHbb8K+r/QP/wLUV5QU?= =?us-ascii?Q?zENtE0UQXgCrTM1Uk78G6rwR1PWaZQpAAGEFw06l2g=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 496ed09f-a693-46d5-4e00-08dc3cfe8908 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 10:25:09.9651 (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: AS4P250MB0464 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/hlsenc: Redo checking for strftime %s support to avoid warnings 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: This is intended to avoid -Wformat= warnings on systems where %s might not be supported (and also generally emitted by GCC with -pedantic). Signed-off-by: Andreas Rheinhardt --- libavformat/hlsenc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index a19b9bb3d1..d5cd627e59 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1878,18 +1878,23 @@ fail: static const char * get_default_pattern_localtime_fmt(AVFormatContext *s) { + HLSContext *hls = s->priv_data; +#if HAVE_LIBC_MSVCRT + // no %s support on MSVC, which invokes the invalid parameter handler + // on unsupported format strings, instead of returning an error + int strftime_s_supported = 0; +#else char b[21]; time_t t = time(NULL); - struct tm *p, tmbuf; - HLSContext *hls = s->priv_data; - - p = localtime_r(&t, &tmbuf); + struct tm tmbuf, *p = localtime_r(&t, &tmbuf); // no %s support when strftime returned error or left format string unchanged - // also no %s support on MSVC, which invokes the invalid parameter handler on unsupported format strings, instead of returning an error + int strftime_s_supported = strftime(b, sizeof(b), "%s", p) && strcmp(b, "%s"); +#endif + if (hls->segment_type == SEGMENT_TYPE_FMP4) { - return (HAVE_LIBC_MSVCRT || !strftime(b, sizeof(b), "%s", p) || !strcmp(b, "%s")) ? "-%Y%m%d%H%M%S.m4s" : "-%s.m4s"; + return strftime_s_supported ? "-%s.m4s" : "-%Y%m%d%H%M%S.m4s"; } - return (HAVE_LIBC_MSVCRT || !strftime(b, sizeof(b), "%s", p) || !strcmp(b, "%s")) ? "-%Y%m%d%H%M%S.ts" : "-%s.ts"; + return strftime_s_supported ? "-%s.ts" : "-%Y%m%d%H%M%S.ts"; } static int append_postfix(char *name, int name_buf_len, int i) -- 2.40.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".