[FFmpeg-cvslog] doc: fix various typos and grammar errors
ffmpeg | branch: release/3.1 | Moritz Barsnick| Sun Oct 9 20:51:57 2016 +0200| [6109c10b81d6bc484996e3407046302d3a537575] | committer: Michael Niedermayer doc: fix various typos and grammar errors Signed-off-by: Moritz Barsnick Signed-off-by: Michael Niedermayer (cherry picked from commit 99d68d462fbd777cfd3fe055d4181a6f7c03fac7) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6109c10b81d6bc484996e3407046302d3a537575 --- doc/codecs.texi | 2 +- doc/demuxers.texi| 4 ++-- doc/ffmpeg.texi | 2 +- doc/fftools-common-opts.texi | 8 doc/filters.texi | 42 +- doc/formats.texi | 2 +- doc/indevs.texi | 4 ++-- doc/muxers.texi | 6 +++--- doc/platform.texi| 2 +- doc/protocols.texi | 2 +- 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/doc/codecs.texi b/doc/codecs.texi index 48fc3bf..3b197a7 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -1173,7 +1173,7 @@ Set to 1 to disable processing alpha (transparency). This works like the instead of alpha. Default is 0. @item codec_whitelist @var{list} (@emph{input}) -"," separated List of allowed decoders. By default all are allowed. +"," separated list of allowed decoders. By default all are allowed. @item dump_separator @var{string} (@emph{input}) Separator used to separate the fields printed on the command line about the diff --git a/doc/demuxers.texi b/doc/demuxers.texi index e34f8b3..25b12a8 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -72,7 +72,7 @@ Do not try to resynchronize by looking for a certain optional start code. Virtual concatenation script demuxer. This demuxer reads a list of files and other directives from a text file and -demuxes them one after the other, as if all their packet had been muxed +demuxes them one after the other, as if all their packets had been muxed together. The timestamps in the files are adjusted so that the first file starts at 0 @@ -107,7 +107,7 @@ Identify the script type and version. It also sets the @option{safe} option to 1 if it was -1. To make FFmpeg recognize the format automatically, this directive must -appears exactly as is (no extra space or byte-order-mark) on the very first +appear exactly as is (no extra space or byte-order-mark) on the very first line of the script. @item @code{duration @var{dur}} diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 7368cdb..3aefc34 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1008,7 +1008,7 @@ Dump each input packet to stderr. @item -hex (@emph{global}) When dumping packets, also dump the payload. @item -re (@emph{input}) -Read input at native frame rate. Mainly used to simulate a grab device. +Read input at native frame rate. Mainly used to simulate a grab device, or live input stream (e.g. when reading from a file). Should not be used with actual grab devices or live input streams (where it can cause packet loss). diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index 509c8bc..a8e485f 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 diff --git a/doc/filters.texi b/doc/filters.texi index 3cf3d7c..b482236 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -845,14 +845,14 @@ A gate is mainly used to reduce lower parts of a signal. This kind of signal processing reduces disturbing noise between useful signals. Gating is done by detecting the volume below a
[FFmpeg-cvslog] doc: fix various typos and grammar errors
ffmpeg | branch: master | Moritz Barsnick| Sun Oct 9 20:51:57 2016 +0200| [99d68d462fbd777cfd3fe055d4181a6f7c03fac7] | committer: Michael Niedermayer doc: fix various typos and grammar errors Signed-off-by: Moritz Barsnick Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99d68d462fbd777cfd3fe055d4181a6f7c03fac7 --- doc/codecs.texi | 2 +- doc/demuxers.texi| 4 ++-- doc/ffmpeg.texi | 2 +- doc/fftools-common-opts.texi | 8 doc/filters.texi | 42 +- doc/formats.texi | 2 +- doc/indevs.texi | 4 ++-- doc/muxers.texi | 6 +++--- doc/platform.texi| 2 +- doc/protocols.texi | 2 +- 10 files changed, 37 insertions(+), 37 deletions(-) diff --git a/doc/codecs.texi b/doc/codecs.texi index 913e257..9d0b980 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -1226,7 +1226,7 @@ Set to 1 to disable processing alpha (transparency). This works like the instead of alpha. Default is 0. @item codec_whitelist @var{list} (@emph{input}) -"," separated List of allowed decoders. By default all are allowed. +"," separated list of allowed decoders. By default all are allowed. @item dump_separator @var{string} (@emph{input}) Separator used to separate the fields printed on the command line about the diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 69890c8..87f78f3 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -72,7 +72,7 @@ Do not try to resynchronize by looking for a certain optional start code. Virtual concatenation script demuxer. This demuxer reads a list of files and other directives from a text file and -demuxes them one after the other, as if all their packet had been muxed +demuxes them one after the other, as if all their packets had been muxed together. The timestamps in the files are adjusted so that the first file starts at 0 @@ -107,7 +107,7 @@ Identify the script type and version. It also sets the @option{safe} option to 1 if it was -1. To make FFmpeg recognize the format automatically, this directive must -appears exactly as is (no extra space or byte-order-mark) on the very first +appear exactly as is (no extra space or byte-order-mark) on the very first line of the script. @item @code{duration @var{dur}} diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index b00de30..47c8935 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1008,7 +1008,7 @@ Dump each input packet to stderr. @item -hex (@emph{global}) When dumping packets, also dump the payload. @item -re (@emph{input}) -Read input at native frame rate. Mainly used to simulate a grab device. +Read input at native frame rate. Mainly used to simulate a grab device, or live input stream (e.g. when reading from a file). Should not be used with actual grab devices or live input streams (where it can cause packet loss). diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index 509c8bc..a8e485f 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 diff --git a/doc/filters.texi b/doc/filters.texi index 4b2f7bf..76265e7 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -911,14 +911,14 @@ A gate is mainly used to reduce lower parts of a signal. This kind of signal processing reduces disturbing noise between useful signals. Gating is done by detecting the volume below a chosen level @var{threshold} -and divide it by the factor set with @var{ratio}. The bottom of the noise +and dividing it by the factor set