Merge remote-tracking branch 'qatar/master'

[ffmpeg] / doc / ffserver.texi

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 8b62c50ceff90b57bd421bcabe296aaa6c560c06..074c075f0be1137957cdf979b2986bb3285c2bab 100644 (file)
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -23,6 +23,7 @@ ffserver [options]
 @c man begin DESCRIPTION
 
 ffserver is a streaming server for both audio and video. It supports
 @c man begin DESCRIPTION
 
 ffserver is a streaming server for both audio and video. It supports

+

 several live feeds, streaming from files and time shifting on live feeds
 (you can seek to positions in the past on each live feed, provided you
 specify a big enough feed storage in ffserver.conf).
 several live feeds, streaming from files and time shifting on live feeds
 (you can seek to positions in the past on each live feed, provided you
 specify a big enough feed storage in ffserver.conf).


@@ -34,7 +35,7 @@ file.
 
 This documentation covers only the streaming aspects of ffserver /
 ffmpeg. All questions about parameters for ffmpeg, codec questions,
 
 This documentation covers only the streaming aspects of ffserver /
 ffmpeg. All questions about parameters for ffmpeg, codec questions,

-etc. are not covered here. Read @file{ffmpeg-doc.html} for more
+etc. are not covered here. Read @file{ffmpeg.html} for more

 information.
 
 @section How does it work?
 information.
 
 @section How does it work?


@@ -146,7 +147,7 @@ that only captures in stereo and also requires that one channel be flipped.
 If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before
 starting ffmpeg.
 
 If you are one of these people, then export 'AUDIO_FLIP_LEFT=1' before
 starting ffmpeg.
 

-@subsection The audio and video loose sync after a while.
+@subsection The audio and video lose sync after a while.

 
 Yes, they do.
 
 
 Yes, they do.
 


@@ -265,7 +266,7 @@ rather than as a daemon.
 
 @c man begin SEEALSO
 
 
 @c man begin SEEALSO
 

-ffmpeg(1), ffplay(1), ffprobe(1), the @file{ffmpeg/doc/ffserver.conf}
+ffmpeg(1), ffplay(1), ffprobe(1), the @file{ffserver.conf}

 example and the FFmpeg HTML documentation
 @c man end
 
 example and the FFmpeg HTML documentation
 @c man end