From patchwork Tue Feb 21 07:24:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 2624 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp266992vsf; Mon, 20 Feb 2017 23:24:53 -0800 (PST) X-Received: by 10.28.136.68 with SMTP id k65mr23933587wmd.48.1487661893825; Mon, 20 Feb 2017 23:24:53 -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 m87si15323747wmc.35.2017.02.20.23.24.53; Mon, 20 Feb 2017 23:24:53 -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=@gmail.com; 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=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B4885680643; Tue, 21 Feb 2017 09:24:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f46.google.com (mail-wm0-f46.google.com [74.125.82.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA95F680643 for ; Tue, 21 Feb 2017 09:24:35 +0200 (EET) Received: by mail-wm0-f46.google.com with SMTP id 196so27035848wmm.1 for ; Mon, 20 Feb 2017 23:24:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=veYDE8JS2dhGtT/5BgpwEu3seR88LsSYdwN5x39zIjE=; b=cblwSnnFPtKNai+JSSE20OB7O6Y2Cgvm87P4O2dwG083EbaSVPo6O1jSFrcfKI8dZa jWE4uLPa5Y1PcBwVb9LsMA/MwFbCYjvrohPheip5oB824kTGZELd+6YNT3D13sS6G8PR GyNmMkpUj3YMYvn6gF4fRfWZaoL09siQG6mAgKPty9Co7AzFiLD0jOYQNlHxFEgwXY55 g0BxSv0c46T2joGrxR1MzI+7d69f5sK909aNHNGYjG6p0hn3BMpW+LE8IgvUvesjrsbJ y6+GugbrphvN18hEX7gC/8uMN7ycgBC2ZueC9e7CaQxVIAxdTeL4c1jpYPzk1D+lThHP YsQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=veYDE8JS2dhGtT/5BgpwEu3seR88LsSYdwN5x39zIjE=; b=g8tC2l56npoT/9uyiljE1E0FTLWfmiF7cc9dM5JmNS9TSUXM1Y2aYY2+WtCXRqGWoy Qh//W65Ydw68rqKVitoknmVyRjcPTeJcPkdRtL+4DFBmVsOHF5765HFl75i/v/OBAKKI 3npJpe0/nsXCX2qcYGiKX/DYn/OIb7ytLBtLk0ZOG7rPAyYg2Ty0hwGpACtZEjMWjR4X FkKhXu5yPXCBY4HnlheXkEnbbai+M+R8fA7tfkGUIa8DPl8Wd9VUJOlyBUniUn0SetKZ FXgcLQS01oK2A3buaNOtWkdawCO5lrQaF7h9E2pFJvnoONncElpgz44bgHPhwM69jL7u LGRA== X-Gm-Message-State: AMke39m9kFhxsEPScpQ6OIDC6SXZ0Id0gG4kn6JxfYzkyrReBi3odR9u14Vs9iN57Iu8Eg== X-Received: by 10.28.142.16 with SMTP id q16mr23051135wmd.78.1487661883429; Mon, 20 Feb 2017 23:24:43 -0800 (PST) Received: from localhost (p4FC4F86B.dip0.t-ipconnect.de. [79.196.248.107]) by smtp.gmail.com with ESMTPSA id 94sm27640243wrl.50.2017.02.20.23.24.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Feb 2017 23:24:42 -0800 (PST) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Feb 2017 08:24:39 +0100 Message-Id: <20170221072439.5508-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.11.0.windows.1 Subject: [FFmpeg-devel] [PATCH] hlsenc: don't use %s for strftime on msvc X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" MSVC doesn't support the %s time format, and instead of returning an error the invalid parameter handler is invoked which (by default) terminates the process. --- libavformat/hlsenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index e673f59710..cf2e3381c4 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1025,7 +1025,8 @@ static const char * get_default_pattern_localtime_fmt(void) struct tm *p, tmbuf; p = localtime_r(&t, &tmbuf); // no %s support when strftime returned error or left format string unchanged - return (!strftime(b, sizeof(b), "%s", p) || !strcmp(b, "%s")) ? "-%Y%m%d%H%M%S.ts" : "-%s.ts"; + // also no %s support on MSVC, which invokes the invalid parameter handler on unsupported format strings, instead of returning an error + return (HAVE_LIBC_MSVCRT || !strftime(b, sizeof(b), "%s", p) || !strcmp(b, "%s")) ? "-%Y%m%d%H%M%S.ts" : "-%s.ts"; } static int hls_write_header(AVFormatContext *s)