diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2012-11-06 11:35:14 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2012-11-06 11:35:14 +0100 |
| commit | d658f9a1cb87f2e2fe739ca0717efa527c46dec5 (patch) | |
| tree | edf8a88a77325ac6a646f357c2a082f821cfd7cc | |
| parent | e8c0b6710cec23a71f7c85b6960f0b334750d346 (diff) | |
| download | ffmpeg-d658f9a1cb87f2e2fe739ca0717efa527c46dec5.tar.gz | |
doc/ffserver: fix typos/reword paragraphs about FFM versions
| -rw-r--r-- | doc/ffserver.texi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi index 4f46f5d116..c94f441cf8 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. |