summaryrefslogtreecommitdiff
path: root/doc/ffserver-doc.texi
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2003-08-24 11:16:29 +0000
committerFabrice Bellard <fabrice@bellard.org>2003-08-24 11:16:29 +0000
commite99c4e1037061759cdfd9b7fe2a1e7ed67673fa9 (patch)
tree1560fec08bd5f8679000dbd41ef3c4b9e0848807 /doc/ffserver-doc.texi
parentd6eb3c500aeab8ae9f138f8eb70d045ac47100ee (diff)
added ffplay documentation - added automatic man page generation for ffmpeg, ffserver and ffplay
Originally committed as revision 2136 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffserver-doc.texi')
-rw-r--r--doc/ffserver-doc.texi39
1 files changed, 38 insertions, 1 deletions
diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index ff37d3b1c4..f6ddb71b27 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -10,6 +10,7 @@
@chapter Introduction
+@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
@@ -17,8 +18,9 @@ specify a big enough feed storage in ffserver.conf).
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.[texi|html]} for more
+etc. are not covered here. Read @file{ffmpeg-doc.html} for more
information.
+@c man end
@chapter QuickStart
@@ -182,4 +184,39 @@ in the future and so unlikely to useful.
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}.
+@chapter Invocation
+@section Syntax
+@example
+@c man begin SYNOPSIS
+ffserver [options]
+@c man end
+@end example
+
+@section Options
+@c man begin OPTIONS
+@table @option
+@item -L
+print the license
+@item -h
+print the help
+@item -f configfile
+use @file{configfile} instead of @file{/etc/ffserver.conf}
+@end table
+@c man end
+
+@ignore
+
+@setfilename ffsserver
+@settitle FFserver video server
+
+@c man begin SEEALSO
+ffmpeg(1), ffplay(1) and the html documentation of @file{ffmpeg}.
+@c man end
+
+@c man begin AUTHOR
+Fabrice Bellard
+@c man end
+
+@end ignore
+
@bye