summaryrefslogtreecommitdiff
path: root/doc/ffserver-doc.texi
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-02-21 10:56:38 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-02-21 10:56:38 +0000
commit8b9da8b50ab88d84bbf56338f7c952a3b6941f47 (patch)
tree76bfce7c987b4c66901c708b4f347f0d90fb4169 /doc/ffserver-doc.texi
parent802da0b4906015abb6e88b0656170989cd843f5a (diff)
Put all the options shared amongst the ff* tools under a dedicated
section "Generic options". Originally committed as revision 21934 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc/ffserver-doc.texi')
-rw-r--r--doc/ffserver-doc.texi4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi
index 444a8cd683..9c33e4104b 100644
--- a/doc/ffserver-doc.texi
+++ b/doc/ffserver-doc.texi
@@ -236,8 +236,10 @@ ffserver [options]
@section Options
@c man begin OPTIONS
-@table @option
+
@include fftools-common-opts.texi
+
+@table @option
@item -f @var{configfile}
Use @file{configfile} instead of @file{/etc/ffserver.conf}.
@item -n