summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2010-02-22 22:21:58 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2010-02-22 22:21:58 +0000
commitfc5607f86209b0a0ddec1b0a3816f7977e15f516 (patch)
treede1f30ffd0cc6add56360a4fe1f870525485f561 /doc
parentb7884740fa2157c6d2a337012370c460e728d299 (diff)
Make -benchmark also print the maximum memory usage if possible.
Originally committed as revision 21973 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg-doc.texi5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index b3de32ad73..2a5313c23d 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -734,7 +734,10 @@ Set meta data information of @var{outfile} from @var{infile}.
@item -debug
Print specific debug info.
@item -benchmark
-Add timings for benchmarking.
+Show benchmarking information at the end of an encode.
+Shows CPU time used and maximum memory consumption.
+Maximum memory consumption is not supported on all systems,
+it will usually display as 0 if not supported.
@item -dump
Dump each input packet.
@item -hex