Merge remote-tracking branch 'qatar/master'

[ffmpeg] / doc / ffserver.texi

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 9a09005343ffc95f7eba858953e4d01c41153cfd..f1b75994275e2631cdfd4eddeeec9fa2e5a6ab44 100644 (file)
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -221,7 +221,7 @@ of an infinite movie or a whole movie.
 
 FFM is version specific, and there is limited compatibility of FFM files
 generated by one version of ffmpeg/ffserver and another version of
-ffmpeg/ffserver. It may work but its not guaranteed to work.
+ffmpeg/ffserver. It may work but it is not guaranteed to work.
 
 FFM2 is extensible while maintaining compatibility and should work between
 differing versions of tools. FFM2 is the default.
@@ -255,7 +255,7 @@ The @file{doc/ffserver.conf} example,
 @url{ffmpeg-scaler.html,ffmpeg-scaler},
 @url{ffmpeg-resampler.html,ffmpeg-resampler},
 @url{ffmpeg-codecs.html,ffmpeg-codecs},
-@url{ffmpeg-bitstream-filters,ffmpeg-bitstream-filters},
+@url{ffmpeg-bitstream-filters.html,ffmpeg-bitstream-filters},
 @url{ffmpeg-formats.html,ffmpeg-formats},
 @url{ffmpeg-devices.html,ffmpeg-devices},
 @url{ffmpeg-protocols.html,ffmpeg-protocols},