[FFmpeg-cvslog] docs/ffserver: document ffm/ffm2

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  5 16:24:57 2012 +0100| [b2b67fd610b8d63a72cfb94be34f9c25710cf3e6] | committer: Michael Niedermayer

docs/ffserver: document ffm/ffm2

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2b67fd610b8d63a72cfb94be34f9c25710cf3e6
---

 doc/ffserver.texi |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 074c075..4f46f5d 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -238,6 +238,19 @@ You use this by adding the ?date= to the end of the URL for the stream.
 For example:   @samp{http://localhost:8080/test.asf?date=2002-07-26T23:05:00}.
 @c man end
 
+ at 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, is version specific, 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.
+
+FFM2 is extensible while maintaining compatibility and should work between
+differing versions of tools. FFM2 is the default.
+
 @chapter Options
 @c man begin OPTIONS