summaryrefslogtreecommitdiff
path: root/doc/ffserver-doc.texi
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2008-06-22 16:23:58 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2008-06-22 16:23:58 +0000
commitdea7da106385de394ae89f2dfd5258bc7117f9ae (patch)
treeae6af38fb4732bda905e4bc52da5998db55fa51a /doc/ffserver-doc.texi
parent9c09099e75fdf8c54e3b1fb3d5f463bbfc2ff700 (diff)
Document ffserver no-launch mode.
Originally committed as revision 13894 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffserver-doc.texi')
-rw-r--r--doc/ffserver-doc.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index b13f7fe721..6099fd2355 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -246,6 +246,10 @@ Show available formats, codecs, protocols, ...
Show help.
@item -f @var{configfile}
Use @file{configfile} instead of @file{/etc/ffserver.conf}.
+@item -n
+Enable no-launch mode. This option disables all the Launch directives
+within the various <Stream> sections. FFserver will not launch any
+ffmpeg instance, so you will have to launch them manually.
@end table
@c man end