| Message ID | 20190926182757.338856-1-lou@lrcd.com |
|---|---|
| State | Accepted |
| Commit | 419e5e794285b9c4df34251a92698e9e75aa5e35 |
| Headers | show |
On Thu, Sep 26, 2019 at 10:27:57AM -0800, Lou Logan wrote: > Signed-off-by: Lou Logan <lou@lrcd.com> > --- > Some users were expecting real/wall-clock time. > > doc/ffmpeg.texi | 2 +- > fftools/ffmpeg_opt.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) LGTM assuming noone has better wording ... thx [...]
On Fri, Sep 27, 2019, at 12:18 AM, Michael Niedermayer wrote: > On Thu, Sep 26, 2019 at 10:27:57AM -0800, Lou Logan wrote: > > Signed-off-by: Lou Logan <lou@lrcd.com> > > --- > > Some users were expecting real/wall-clock time. > > > > doc/ffmpeg.texi | 2 +- > > fftools/ffmpeg_opt.c | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > LGTM assuming noone has better wording ... Pushed 419e5e794285b9c4df34251a92698e9e75aa5e35
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 },
Signed-off-by: Lou Logan <lou@lrcd.com> --- Some users were expecting real/wall-clock time. doc/ffmpeg.texi | 2 +- fftools/ffmpeg_opt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)