Merge commit 'd60c2d5216930ef98c7d4d6837d6229b37e0dcb3'

[ffmpeg] / doc / formats.texi

diff --git a/doc/formats.texi b/doc/formats.texi
index dda81e6f8d1e3a962f0c77dcb6bf37f879be9175..87704afb6c00d5a2c99ae3b5ce2d6a6aa6ae4b36 100644 (file)
--- a/doc/formats.texi
+++ b/doc/formats.texi
@@ -63,7 +63,7 @@ This ensures that file and data checksums are reproducible and match between
 platforms. Its primary use is for regression testing.
 @item shortest
 Stop muxing at the end of the shortest stream.
-It may be needed to increase max_interleave_delta to avoid flusing the longer
+It may be needed to increase max_interleave_delta to avoid flushing the longer
 streams before EOF.
 @end table
 
@@ -199,7 +199,7 @@ delayed bt the time duration specified in @var{offset}. Default value
 is @code{0} (meaning that no offset is applied).
 
 @item format_whitelist @var{list} (@emph{input})
-"," separated List of allowed demuxers. By default all are allowed.
+"," separated list of allowed demuxers. 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