From patchwork Tue Mar 5 10:27:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46808 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3944:b0:19e:cdac:8cce with SMTP id ac4csp303512pzc; Tue, 5 Mar 2024 02:25:21 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU07Cl3xyGmIHwD9ed44NiGUip0XXwjso79AhjcujevK7J1QUE5bITQIEI2RcnA479u76PkMaCshRNR4Z+krgOk+WQPvjI4grzZJA== X-Google-Smtp-Source: AGHT+IHHg6GnUqIbUgZUYviEB8keqE5Jw60bTRmdKmEmHMGW/mikjDk5gi3XqnS1dGRUEompnMny X-Received: by 2002:a17:906:271b:b0:a45:ac3b:4aca with SMTP id z27-20020a170906271b00b00a45ac3b4acamr663802ejc.44.1709634321602; Tue, 05 Mar 2024 02:25:21 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sa20-20020a1709076d1400b00a441670d0d0si5114699ejc.565.2024.03.05.02.25.20; Tue, 05 Mar 2024 02:25:21 -0800 (PST) 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=GOUqpr4+; 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 CE96D68C2B1; Tue, 5 Mar 2024 12:25:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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: DrPYqQtjnic7w2qk2PbWo7D85bgPltJg7r/5W0DRdLn7GW9bX69D5Kg2vO/9vztMFOui9HN+y8NCNPEinHU0FtSiGZ9JxUiqOcnyAKbiAwL3p6RQ8lBtWILSqtjSTj0oZ4H26zuCPWMB5Qhzk+DkWJ0tznjS3y3yDyrV9ag+dI7ocbZdwCwFm8ULH80a9816ad1EPQVAicOB5rYAyJX7Vb5vCT1AvGNxzcNlF/NtHLhYo0KNbEfxbCcxQrDXMAJ0kPK2HEWHgdDTGvLlH6QKItCKfP34gGWMhgPJeNZf81M4eYC9lOhKQZKqiuktmBMFjWaJNs+Pnh5vYii/woqSGUy5w5RSwW4AUOy+pGeJyWKVMlO4bxDrE0EBEO7jPuHhpVyZuTWYbUQ4tT9XCSEGUtjN3Euy65EQD5PWduSQO/qXkKuPotJl8jdXdXWgyxYwwVFSE8aaaQaZCLlMTDDYs9Zeli67+wCrjZP5FGISOeeN1NPvKXLaYAe9Ar9SzFhazufWCdH7KZjiBiUfq+3K0mBCCfZdI1Xc59Qbs45/RXT7XhANAn61kmeQmQwL6bdN3ui6/W/5z03oJWQv+9dQQF6Uk11RHDrTBmtsIl2JskGgiW4W3ykASoKbzYY8RkoEuzkZamGf7zlxiQtX6r8y9B5TJt/6UK0oAb5xSeY75v0EsxrZjh1/OR/ETdR/4wlB3M1eB1dYijQeKODPyhXYYP9582YrqXXwL2ohsAgygPV6xX04dR7bThKVuFbLAmiEQftLIHK6tPJ8yyCENW4IRvt5pauJZLRSIE5mL6Kt825LWNmolwJwM7+WoBaEWus7FC5Pmozg5N1YyOeIornioE0Z8Dp5ewQJNLwNTW0dh1uw+B/O4grPg9TGTEsGAU+KSTrv6mT7MWUfrP5rFUbqUCLbbpB6EbXdOl4PxoDYKlDJKhI45iyPqYQ1sWkVF7/GW89QXqdORdZevbDCT0RUlbiXFDnI5gq0UWTAQh+K1zYT//kL2ObnGShhLW8mwBzT3/p5rjCmxrM/WVj+FDEr+VyTBn7+7UQmXZOoC82oRsgkpNz+SA61mlcGY5jx9OBYIAn8+YqDTVbQD2X8cIYucv07avt48CdLOrLh8IYekaTBbXJejf65gyqUxn8BZMDsmT9Di2SCMHHf4/6FrmjsxiE64WNjnx5k0K1NiX1xfgT2rF+QB+OgRf+78reutGgUtODX2ylyzXXiDXPs62kKg5bD1WHbb8K+r/QP/wLUV5QUzENtE0UQXgCrTM1Uk78G6rwR1PWaZQpAAGEFw06l2g== 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fbSm515hZfMk 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) From patchwork Tue Mar 5 10:28:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46809 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3944:b0:19e:cdac:8cce with SMTP id ac4csp305367pzc; Tue, 5 Mar 2024 02:30:03 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX4LKlazhh78TQuuY5JP+Sn1XZKR60ApTPSpF+mWh+8QDneUVyJaeoRDFYhK8/StZdgYtxtBxkq04r3shRbdryIjZikHEYb2XyJNg== X-Google-Smtp-Source: AGHT+IFJgBnJxDlUNA028XZhgY9rHrZ5aphisMLaf9LSCIo+yOgCqs36udesDy58XiPld28ueA0G X-Received: by 2002:a2e:bc14:0:b0:2d3:e0ec:36c7 with SMTP id b20-20020a2ebc14000000b002d3e0ec36c7mr1207176ljf.43.1709634603618; Tue, 05 Mar 2024 02:30:03 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x18-20020a05640226d200b00566c153dd59si4297572edd.55.2024.03.05.02.30.03; Tue, 05 Mar 2024 02:30:03 -0800 (PST) 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="C+eDnR/A"; 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 932EA68CE01; Tue, 5 Mar 2024 12:30:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2015.outbound.protection.outlook.com [40.92.91.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 551C268C545 for ; Tue, 5 Mar 2024 12:29:54 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YqIKyxcc9uEFBChXuZvYVTlPDc18el1IP//jjQKEYa6V8N/egtBspM6O1ODPKT3nkmzXFADqoC7Hq30dHLPFY67S7rSRSZFyz+2pEHM5VXiDAieyG+hhoxrw45wCcfYb/mZ/p399Y83NRg78ZPhv89+cZ8zyTqL7bYEpR6PW08niRgNljkyOnWXlrTJ51oVGy7QFfAWP7cT3vtIznytuqV762HQBBveUgc/1YwncPlC3SVWb8P89q47RuOUHHAF7djI2wdzNbVuyELLe9B82DNV5MTwg6EmfD5eJwKrLoJkNuTCDHjTSGTorXYSAa7SH8ctg4RZOiql60/4kkOrxpg== 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=dujC36ipTEi2aI6Fl61MLZqJFJSGikyaEwt47ZRsgqQ=; b=Td+rL8yWyMCV2hKiwcYLqM1gAYBfsWYqkbQ0OKgeg5n73ghOfq+X3RWRaAOB9EZiAmJI84dmfEKNvK5+Kjn7E/TkWlj24Qamo+sQQa4nFEsXPRWO12v1iCbCMs75U1RKFItN2Jw4smBqGc4LE92P7EQL9p8/u4g0YgKgJfVbnokNauG76DfYetBS6le0c7lz6dD8TuXBXc1c8lhek72QOt/BwPO8LEtEAhIBPVtAjSUSE2lCcYJjzZU4ugW5SdiA5CMxwyt1IbthJ4P1Hta+2vDuDXjPnsA/njfTIgPf02RSq8yNYg73RSvfFPC2RQ1UWjvT6+52GjKNKyvSB+SmNQ== 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=dujC36ipTEi2aI6Fl61MLZqJFJSGikyaEwt47ZRsgqQ=; b=C+eDnR/AJyqOmneXylfRGI7zdb8AjD0HiM70JtEUyx+BVd6KMxT6a87fG7/xH1aYD+Vj/xNp+F/XmQyPL2lZz9l3rzJj0ILF3kqZ0pVBKNOHH3W/WGBl+LGG1F/11SG9ZYwXTHFxsIVV/UXXcuUQOSXt3andqEBw+FuH8Pqn2HrTvq52FBxB9O1J7epL62e6QhoIsZdjYIlbGs70xyRIl57R8kktN75sUoSUI+P/XXTHumfvehToIWgm240kK1W7d14o0WsM9nt++aR2tgI0C/w8Rr314oROQTJquzd38yTAKawCDpKyTJVsKO9VzkwiJSvviZ5BnKyOzb5bcl47Ww== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0510.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b5::18) 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:29:52 +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:29:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Mar 2024 11:28:35 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [3Xhoa0pLr+N4PSiFrdTLjTUjQk8tAx3A+oYNCnqnrII=] X-ClientProxiedBy: FR4P281CA0261.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:e8::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240305102835.2230596-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0510:EE_ X-MS-Office365-Filtering-Correlation-Id: a88e896b-f43a-4aea-4b18-08dc3cff3160 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqePc+++EJYXLAVIXWJNpI2YUcUFghPx2cxw+B40+gteMGgVLH1IyQIxy17/0EzybbpltmvbM8HzXuWE054VRXHz6i3hHcXj4I/nCQxkjsFJ2nZFs5Ejvn6fiHt7NXwJYD7GJ44L7bC5kXoReFiu/rby0u1z+XRhL/0Ud+b27Cm3Q/F4LOpSgzd9/DJ/udlliTXfC7AT4hXawZE7m8PkhIwUTylocjTqyV539OnFxgsbkPxPcKMe3XSMnAmTuZ+5tW3k+0nNCKFQImVr/64vQwHYtoLzi/p6iLX5H1arm/Td+/onueFblHEfGErTjgcayNppu1AwOI/t92+QHP1RHsAnMrwcBGyyIBrimkxY2KinCE6E2QiRE6Zko5nZQ1EQqRTe8priJV2COu7dFk5n7S0xyCKhVivwN1VJuRYO1kdRtvijObGBgRVbE7j8m+KQG8JBgNF+iWiAHAtLlQVcYEcoHe6xSIHtnrHuZDw30xxBa6xPxUynFtDwv+kHwqC0y3v+8MkzwTM6YCDIuDSa5aN3DfMunz2oI7ctFBXLH8YiVQCcnCxilzYK+rmL+EGrrLv/9XXKCarHPmUkpWoUaNtT0RHpWxFB/S+rxpv4eq+5RBqotPLoI9nLzr0jfgWfsRUz/DXSOJWMK4Drf2AjXBFJvJkni3FhqRypnW09rIyRWPSIyUWu5ZQzWdCkvLJa3IdaebkE5we7iF+AQYhdsEJ6q6A/B9TKKyzG+Z9fyBeDOPwNW6p9geMdBSp5ZCVVV4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sV3SeB9tMF/kJn2tPCvOKrlc6rBOAOdkedgdtS/rmu5aOo/M2w4z7G7l5vb4TSdciZugQnGOvouBeLNAm48iUh8lOcZ6OkDZ6QGrcb98/DLZn2haA5FxvuOfVe+y2jO3+831DbvHKhTptEQHmNTuNPKlZoXT7ZopfEtFlOACwv2CRmMrRhSoBHmN1F9ua5D0ogSvA7NOtQhscGYGXKax3QvC1bpvk9i2CSmGYvBo0PFvoxSJ/dhHN0iICHZWCRUXFmVNDpSq0x9gMa+QFrEZodr4AGyYxN25ZRsmX4vx4FKvr4mjB82D4ffrcxiCYVE9VUfsVen/ZWEJWuxVq+aZqIe0MKV6k+u1kATUKTINcVePvBZTG+lWJDFdE2dIilIsBGj7NaSJKnZVYrNNl231f100DwHL6cAQajzu8oxcNgH5VSuwMT1ijM3xXaRDMNmNwJyZCXBQpJ2F37PvZdH6qagO6sbNxGbAFRREWaivLvKWLOi94Qp6PAM7ZGJj835rnzVq9U0oew9xNX6fJVCSfqbtiGbt8b3FUuBS4jZbNxXroKpKLlBzu0j/zTFYYmrgMIj0I5RRo9aaCEbQwfWqRt7v6gCQ2eMUJQcFSwqSO9ajjwpdDPv5HtKM8+EMXrau X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k9eX3mDFjN2ov++CltLwgPgCS27sN4XBkKUaheQ+eq7pP6lyerPWKIAfsFgC4xQtwasjIwAMguzMegHSc7p1dkXK280aA4WxkkqYNwg4kTDd+81OWCEZOJZuqkj97fkWLgt/aKGEOwh2dykbPS0Uo1wNIdsvo52Csdx9WTyNHte3N75J4Fz1bwSHcpbMjj54733ray6OLCqFYvRVqWRGEceD7ydg2AOH3aGPiAGSwQ99D/WX5wR04R9wF8q0deTo/xYub0XOTsHouFZ5G72MlnQ353+uug0rK7YWJq6sJbx1n65PdJDSVrsHBHIH/wJ2snJzCFCAHhlxdA0M/lY/r6mgooO1WwZjwPqVnGE8gOPGaWB1av2Q76NZOOUhzwc8Zr6h29ljSfc0kAUpseqf9EWYoRI485AcCVd0nVxZXMzl8lWkdUuRkRM+Z2/+ls+h/TpdJGyUN3YkhPoYXApBKhOgDAUMF/9ZHZfIlwkj41jCHCP2GeUGCQJdUHvTyQDHgqZgeZlR+Li1I2+kRCFguIGwUR/c3ZPsBGUnlm+oEMNuO32a5PwgKHKFjsxlwOP5SkI/KaCPvN1Yaf8E2wbXAtL9ktbBjoOEug+o7zuDpzRa5c5TNb8Sw3AzDX8UjOQHzzkQboMebDDUgHV8uv78fppgCgnYu0rqRJ35YC12nvVghwaAN3UMcAZPfpZYJH5yg+Lj1/XHoqEHbhrNxfkYtSxV9LviwibVlrIyQaek/KRbAxVfmYm4k3hoU/oEsEMYbs2z/jiMU3nAXh2l8kF/AUpMoUIGDZygqzvQQBJzfWFQ7f2DRRcjoE6tEK6c6eGE9Oem9n4uAaottoylrN4XcJKKHSwT41V/z/bnh0O9N9Kw4ULomE/TGSqMHQ0Q2E13T4m6sLKoyb+iGPC9s8wPU0mVAAKpMnpV5tdpv5luhMGDLt4hpwm8kGpsLuAmE7pRVgxPq72mtP/MR5Ds98P/j8pjrYr5X9tAfAYVTS909eqYNlEzf+u8CVbzEOIEqgElwImmyJ9c4TvuwhIa3AqLxpxa4P+aq/U1cdmp3X8ArKfFZ4l7I5+DsfQ54aPDwdO4so3mCYie4dN3VBGbz+P3mtKRoyIxWpDU+hUWJmO8MlqYkejxaLuyB7JLRwWSTPjPA+39bwzfj+AL/DzuXsfyqIlcJuzQzG3Ju7wqoJP34QJKXZjieG+E0hOjxhfw3H1b0koqgRsx+hkqrgQCb6H/42o8wDfwZkr5a1jmBd0zAaMvwrNh2FSsYD9aUHlwSLX30jWhuDHMdLeBmPCEYhPi/A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a88e896b-f43a-4aea-4b18-08dc3cff3160 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:29:52.4161 (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: AS4P250MB0510 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/dashenc, hlsenc: Return 0 on succes from write_header 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: pFpjQo8kWYOm Do not propagate the return value of avformat_write_header(), as it contains the information whether the output had already been initialized in avformat_init_output(), but this is set generically; the return value of FFOutputFormat.write_header is not documented at all (and is currently ignored if >= 0), but it is more future-proof to simply return 0 on success. Signed-off-by: Andreas Rheinhardt --- libavformat/dashenc.c | 2 +- libavformat/hlsenc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 435a5e8afe..5e31b09486 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1747,7 +1747,7 @@ static int dash_write_header(AVFormatContext *s) (ret = flush_init_segment(s, os)) < 0) return ret; } - return ret; + return 0; } static int add_segment(OutputStream *os, const char *file, diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index d5cd627e59..e560aa6a20 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2372,7 +2372,7 @@ static int hls_write_header(AVFormatContext *s) } } - return ret; + return 0; } static int hls_init_file_resend(AVFormatContext *s, VariantStream *vs)