Merge commit '6490a0c0fbe0e55f765ea2aa2e8495181ea1f719'

[ffmpeg] / doc / ffserver.texi

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 57c95fbbda89bb6fa691e0e87661cabaf75eaa30..336cec19a2e7e54f685cd195b86627898ffe7861 100644 (file)
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -72,7 +72,7 @@ the HTTP server (configured through the @option{HTTPPort} option), and
 configuration file.
 
 Each feed is associated to a file which is stored on disk. This stored
-file is used to allow to send pre-recorded data to a player as fast as
+file is used to send pre-recorded data to a player as fast as
 possible when new content is added in real-time to the stream.
 
 A "live-stream" or "stream" is a resource published by