diff options
| author | Lou Logan <lou@lrcd.com> | 2019-09-26 10:18:57 -0800 |
|---|---|---|
| committer | Lou Logan <lou@lrcd.com> | 2019-09-27 12:11:39 -0800 |
| commit | 419e5e794285b9c4df34251a92698e9e75aa5e35 (patch) | |
| tree | c43b7ab16209958d6b1b823f7321e1718eb518c3 | |
| parent | ab0ef1abdf53e257f7628f2d264adc80038f3bcb (diff) | |
| download | ffmpeg-streaming-419e5e794285b9c4df34251a92698e9e75aa5e35.zip ffmpeg-streaming-419e5e794285b9c4df34251a92698e9e75aa5e35.tar.gz | |
doc/ffmpeg: -timelimit is in user time
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | doc/ffmpeg.texi | 2 | ||||
| -rw-r--r-- | fftools/ffmpeg_opt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 1da18d9..9cccc23 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 b2aa63e..661441c 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 }, |
