virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

doc/ffmpeg: -timelimit is in user time

Browse Source 
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Lou Logan 2019-09-26 10:18:57 -08:00
parent ab0ef1abdf
commit 419e5e7942
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ffmpeg.texi
View File

@ -1383,7 +1383,7 @@ it will usually display as 0 if not supported.
Show benchmarking information during the encode. Show benchmarking information during the encode.
Shows real, system and user time used in various steps (audio/video encode/decode). Shows real, system and user time used in various steps (audio/video encode/decode).
@item -timelimit @var{duration} (@emph{global}) @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}) @item -dump (@emph{global})
Dump each input packet to stderr. Dump each input packet to stderr.
@item -hex (@emph{global}) @item -hex (@emph{global})

2
fftools/ffmpeg_opt.c
View File

@ -3443,7 +3443,7 @@ const OptionDef options[] = {
{ "stdin", OPT_BOOL | OPT_EXPERT, { &stdin_interaction }, { "stdin", OPT_BOOL | OPT_EXPERT, { &stdin_interaction },
"enable or disable interaction on standard input" }, "enable or disable interaction on standard input" },
{ "timelimit", HAS_ARG | OPT_EXPERT, { .func_arg = opt_timelimit }, { "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", OPT_BOOL | OPT_EXPERT, { &do_pkt_dump },
"dump each input packet" }, "dump each input packet" },
{ "hex", OPT_BOOL | OPT_EXPERT, { &do_hex_dump }, { "hex", OPT_BOOL | OPT_EXPERT, { &do_hex_dump },