From patchwork Thu Sep 26 18:27:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lou Logan X-Patchwork-Id: 15319 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1AB9D44A890 for ; Thu, 26 Sep 2019 21:28:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E904968A2B1; Thu, 26 Sep 2019 21:28:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A211688184 for ; Thu, 26 Sep 2019 21:28:02 +0300 (EEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 2F3CC21D46; Thu, 26 Sep 2019 14:28:00 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 26 Sep 2019 14:28:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lrcd.com; h=from :to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=007qqLpF6mUoZNOgjVfCnbpN69 ozBjNUWC/XjdRHI00=; b=OnAfO+a8imk0aUDoCBV7NWhibf3rpn44M1kQXyifYe sTjdW7bH/gmy51JazKSSfUm0Ud8A9tHfUWOpvPNXtCOVyryenKsTfdAIcuS9edAb kzzTl2EotrxurKXox/oe/g3IZpsjj88fYzBK5AHsm0G+lthaLikgy8aRPnq7e4kv Jx/qnlHLsN9/P00dWZJXbZWnBP46yG0+rFvWCQuflUJgxElAD/4Zn2z5WhNC1hi7 XUcodgHrkd8rvTg6HxTOa+Bz8fH/vEL6YQFWbq/NnSr6AO2KdEki5aqb86SltYmU AzZlyvcY1vpFER7wHX6IybxifwMcw8pfPbi0pvmhaVjw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=007qqLpF6mUoZNOgj VfCnbpN69ozBjNUWC/XjdRHI00=; b=atazhu47jD5oyjT4+rXxnMrlQFPS36l9z xJaypX/nskBgveUvqRBaBOoROhxL6Pt36HJj5wKelQAnymJPoFtBHDTZDRvDMCc3 fd26VC+wBTWsogtg+9zYpdclHpmq3AUof7kVJ6rAl0QsKzFXhmS4MnksmHxf2oCv dwLnsdLaKUgTkuMVdkb8BFm/r0XyrrmbE37hVsPHHKvN8i/V77/yjnAVyH1cqTMC N2cuv5hT2kA2YwYmDM5ENd0Kxsokl31TvKJM8fcfyeZWYtXIRGScYOroarje1ouE 7anUpYqmahRcyOq+4ROmKiB01mbjjvJYtQXhqdIWm+L+wgeEc+9CQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrfeeggdduvdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepnfhouhcunfhoghgrnhcuoehlohhusehlrhgtugdrtghomheqnecu kfhppedvgedrvdefjedrvdelrddutdenucfrrghrrghmpehmrghilhhfrhhomheplhhouh eslhhrtggurdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (10-29-237-24.gci.net [24.237.29.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 2FA86D6005E for ; Thu, 26 Sep 2019 14:27:59 -0400 (EDT) From: Lou Logan To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Sep 2019 10:27:57 -0800 Message-Id: <20190926182757.338856-1-lou@lrcd.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] doc/ffmpeg: -timelimit is in user time 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Lou Logan --- Some users were expecting real/wall-clock time. doc/ffmpeg.texi | 2 +- fftools/ffmpeg_opt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 1da18d9d0b..9cccc2337d 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1383,7 +1383,7 @@ it will usually display as 0 if not supported. Show benchmarking information during the encode. Shows real, system and user time used in various steps (audio/video encode/decode). @item -timelimit @var{duration} (@emph{global}) -Exit after ffmpeg has been running for @var{duration} seconds. +Exit after ffmpeg has been running for @var{duration} seconds in CPU user time. @item -dump (@emph{global}) Dump each input packet to stderr. @item -hex (@emph{global}) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index b2aa63e7ee..661441c161 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -3443,7 +3443,7 @@ const OptionDef options[] = { { "stdin", OPT_BOOL | OPT_EXPERT, { &stdin_interaction }, "enable or disable interaction on standard input" }, { "timelimit", HAS_ARG | OPT_EXPERT, { .func_arg = opt_timelimit }, - "set max runtime in seconds", "limit" }, + "set max runtime in seconds in CPU user time", "limit" }, { "dump", OPT_BOOL | OPT_EXPERT, { &do_pkt_dump }, "dump each input packet" }, { "hex", OPT_BOOL | OPT_EXPERT, { &do_hex_dump },