aboutsummaryrefslogtreecommitdiffstats
path: root/doc/fftools-common-opts.texi
diff options
context:
space:
mode:
authorMoritz Barsnick <barsnick@gmx.net>2016-10-09 20:51:57 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-10-11 17:02:27 +0200
commit6109c10b81d6bc484996e3407046302d3a537575 (patch)
tree0113984576a619ec132cbda45f506da4383b303d /doc/fftools-common-opts.texi
parent08eef74a39d73bec80d4a12f0eaca6a3602a2024 (diff)
downloadffmpeg-6109c10b81d6bc484996e3407046302d3a537575.tar.gz
doc: fix various typos and grammar errors
Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 99d68d462fbd777cfd3fe055d4181a6f7c03fac7) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc/fftools-common-opts.texi')
-rw-r--r--doc/fftools-common-opts.texi8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index 509c8bca7c..a8e485f43a 100644
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -176,10 +176,10 @@ loglevel will be used. If multiple loglevel parameters are given, using
Show nothing at all; be silent.
@item panic, 0
Only show fatal errors which could lead the process to crash, such as
-and assert failure. This is not currently used for anything.
+an assertion failure. This is not currently used for anything.
@item fatal, 8
Only show fatal errors. These are errors after which the process absolutely
-cannot continue after.
+cannot continue.
@item error, 16
Show all errors, including ones which can be recovered from.
@item warning, 24
@@ -195,13 +195,13 @@ Show everything, including debugging information.
@item trace, 56
@end table
-By default the program logs to stderr, if coloring is supported by the
+By default the program logs to stderr. If coloring is supported by the
terminal, colors are used to mark errors and warnings. Log coloring
can be disabled setting the environment variable
@env{AV_LOG_FORCE_NOCOLOR} or @env{NO_COLOR}, or can be forced setting
the environment variable @env{AV_LOG_FORCE_COLOR}.
The use of the environment variable @env{NO_COLOR} is deprecated and
-will be dropped in a following FFmpeg version.
+will be dropped in a future FFmpeg version.
@item -report
Dump full command line and console output to a file named