[FFmpeg-cvslog] doc/ffserver: fix typos/reword paragraphs about FFM versions
Stefano Sabatini
git at videolan.org
Tue Nov 6 11:37:19 CET 2012
ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Tue Nov 6 11:35:14 2012 +0100| [d658f9a1cb87f2e2fe739ca0717efa527c46dec5] | committer: Stefano Sabatini
doc/ffserver: fix typos/reword paragraphs about FFM versions
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d658f9a1cb87f2e2fe739ca0717efa527c46dec5
---
doc/ffserver.texi | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 4f46f5d..c94f441 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -240,13 +240,13 @@ For example: @samp{http://localhost:8080/test.asf?date=2002-07-26T23:05:00}.
@section What is FFM, FFM2
-FFM and FFM2 are formats used by ffserver, they allow storing a wide varity of
-video and audio streams, encoding options and can store a moving time segment
-of a infinite movie or a whole movie.
+FFM and FFM2 are formats used by ffserver. They allow storing a wide varity of
+video and audio streams and encoding options, and can store a moving time segment
+of an infinite movie or a whole movie.
-FFM, is version specific, there is limited compatibility of FFM files
+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 guranteed to work.
+ffmpeg/ffserver. It may work but its not guaranteed to work.
FFM2 is extensible while maintaining compatibility and should work between
differing versions of tools. FFM2 is the default.
More information about the ffmpeg-cvslog
mailing list