aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2008-06-24 09:07:19 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2008-06-24 09:07:19 +0000
commitfb6b04aae95ead60ab88f03c7c220408f6849dc1 (patch)
treec01dbcb3a4a1ffce077117bfa4d0d59990cee2ea /doc
parent941b1258b8c988bbe5e089699817a204462682da (diff)
downloadffmpeg-fb6b04aae95ead60ab88f03c7c220408f6849dc1.tar.gz
Incorporate ffserver documentation Quick Start chapter into the
man DESCRIPTION section. Originally committed as revision 13941 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffserver-doc.texi4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index 243f4b060b..cbb7d801f4 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -25,9 +25,6 @@ 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.html} for more
information.
-@c man end
-
-@chapter Quick Start
[Contributed by Philip Gladstone, philip-ffserver at gladstonefamily dot net]
@@ -229,6 +226,7 @@ may be in the future and so is unlikely to be 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}.
+@c man end
@chapter Invocation
@section Syntax