From patchwork Sat Mar 3 20:19:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 7808 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp926923jaj; Sat, 3 Mar 2018 12:25:39 -0800 (PST) X-Google-Smtp-Source: AG47ELvqz+lPI/wYQq4XvyHwcgpzt2TqV34DICl8p7djUGMFWkabJhgjpHbjdwbB+YnzF8Po8Rec X-Received: by 10.28.175.139 with SMTP id y133mr4230649wme.98.1520108739340; Sat, 03 Mar 2018 12:25:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520108739; cv=none; d=google.com; s=arc-20160816; b=nRi6gn6zSH0PBD4UVIkJOnBNjf0fD0gf0eOdtCUmC6KG7Hd2n/SeBkn/Pt3N6crgBY vwLa9rYZd0uw1DRXFJOJa1G7eIQal5iswr5VBjk5X0LSjTepVvYlY67BULln60WzpXiX x1asEhNXSt8+dvKRRgY/p+mJrpz7tvTjpa2hkheUFsOSdk9jDVFSaDZq4QvLAJS4PFin bTccI54y7JP8YynY3pi2hkRbF6N4pPIzMRU7aHFMH4gSsWlY+fftW4zYlccN7ja8/yHR iymgj/QK9qLVVfoheQgUq/AlCS5ur8cKFuLlXpCwu9EwFNGH2ianj19xLE7hy/tvNnn5 ZRTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=YjyYJ+YV44YfLlPjIOmb6QaH8nzRMwKoS/M2KmtREgk=; b=DcL2od0qwiF0XLS9H8kRflNXm2u+VoOKn3dY0wWJjOvcuhChEnVoG2xwrCb01z+t5d iC8OL5jywDxxRbdy8E6XcibSYw5NwUaHYFJMz5nPv3YkJ/gTlTg4mRLdGS7ODD71eHMT mwOMxcNL/8f0BVgiBz9BTTo3yfitmEAs0FzLTIOYkTYd/EzsQV69nQLHEriEZ7E0CK7u Wt1nSbgpVQ84R0Ny5Jkq0TrIvgZUOmGPTJWfJl+QDNWy80UBlBhK5cIQJH4OdoFhvg10 5RewpUBNWgGE5waWteu+4fPg8it3Lm5as+KFfsjWyxCr63fnMxZV5JLWRvURD10+K7Mq zNag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=uR5KtXUJ; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 202si2511588wme.113.2018.03.03.12.25.38; Sat, 03 Mar 2018 12:25:39 -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 header.s=20161025 header.b=uR5KtXUJ; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E82CF68A4E5; Sat, 3 Mar 2018 22:25:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A25D168A4B5 for ; Sat, 3 Mar 2018 22:25:23 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id u49so13378968wrc.10 for ; Sat, 03 Mar 2018 12:25:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=zDBVb4EbNWzRhU6z6m6Zm0aySB8wOhuzzFDcNjLTR64=; b=uR5KtXUJAoDKU5qhuSivI+WF1SZyBVRO35JprBuiQRep3uFsHGI0v80YfegfAG5q+t cQHk/u7lnEHPPiuRiI644Py2uWKMLeTf3o3GefL07By2cwpUZWoBtGBCaaXoQIl4NPuv yJv1RF4ALgD924i+3DV+qdfIySlajFIOfN7V4JzanALaZO11YheFRSzX5CisSmxo0YC0 QF5XcmGd0o23KmVNNE4NlL6tBWW+Yve85RYPPM4Ixx1Z/CCMyW2g3t8b4MUnIdzm9tDJ D8Y1oydqHy9ys7UuhmDX6kpr5ys27Hoa5JzSXU/fHl8yylANGrBmrN3YX4JUqTbdnmiC O9Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=zDBVb4EbNWzRhU6z6m6Zm0aySB8wOhuzzFDcNjLTR64=; b=GXTnC1VNWJqvq658msYe/QlaqQvCon05M5OE0npupCy34+OJ/KqI/aTznhmNChzaAB 2pTzIrAJoEJtjxHr90KxRbEYqTRF20MraeqFF2ahO0TvG/0ssdH2bkQfx/2Hz5ZhhAxF 8v1m1velr+bw+awJegpE7tILAz4Y0bGB9l1Z4NKnpZb/6TZpackXb83uCucsqfwkBlu5 onON33Nl6lHTcGYdpTpK65fzI3QAkkBgVv0G8vV0LN/oIZZwfgem3OfVzBZ4ztriZ3L2 JhGh6vDFKb2lbGn0FgipbhgSqG1+QBcpgFJIaCDdy/occPb8T2SGkQ62uUBSB35laCPy GgQA== X-Gm-Message-State: APf1xPDGlDux3ifm40gjAmTJqpumNXTIjw472eTbg8VwTLvK+GBnEMHC s7oXV0IkF1AirbBaH3JNXpNZMdsm X-Received: by 10.223.132.103 with SMTP id 94mr8009539wrf.275.1520108386665; Sat, 03 Mar 2018 12:19:46 -0800 (PST) Received: from moonbase.pars.ee (host86-177-183-9.range86-177.btcentralplus.com. [86.177.183.9]) by smtp.gmail.com with ESMTPSA id 4sm3314902wmz.31.2018.03.03.12.19.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Mar 2018 12:19:45 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Mar 2018 20:19:43 +0000 Message-Id: <20180303201943.15000-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] parseutils: accept only full "ms" and "us" prefixes 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 Cc: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The commit which added those was pushed prematurely before anyone could object to illogical suffixes like just m for milliseconds. Without this, we'd be locked into never being able to implement the "m" suffix for minutes. Signed-off-by: Rostislav Pehlivanov --- libavutil/parseutils.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 44c845577a..1b81757aab 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -689,17 +689,15 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration) if (duration) { t = dt.tm_hour * 3600 + dt.tm_min * 60 + dt.tm_sec; - if (*q == 'm') { + if (q[0] == 'm' && q[1] == 's') { suffix = 1000; microseconds /= 1000; - q++; - } else if (*q == 'u') { + q += 2; + } else if (q[0] == 'u' && q[1] == 's') { suffix = 1; microseconds = 0; - q++; + q += 2; } - if (*q == 's') - q++; } else { int is_utc = *q == 'Z' || *q == 'z'; int tzoffset = 0;