aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-11-28 18:49:27 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-11-28 20:16:46 +0100
commit4e39962f0c396c5760b81be0c0c3bf3c0c2a46e4 (patch)
tree4ce511c48b7b7904b8ba63cd5521e5441dc2c8c0 /doc
parent07315da1497c834587c8a66fa8e33640c6e214c8 (diff)
downloadffmpeg-4e39962f0c396c5760b81be0c0c3bf3c0c2a46e4.tar.gz
doc/ffserver: document "Launch" feed option
Diffstat (limited to 'doc')
-rw-r--r--doc/ffserver.texi16
1 files changed, 15 insertions, 1 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 1506742224..007b0981f2 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -335,7 +335,21 @@ Set maximum size of the feed. 0 means unlimited.
@item ReadOnlyFile @var{filename}
Mark the file as readonly and it will not be deleted or updated.
-@item Launch
+@item Launch @var{args}
+Launch an @command{ffmpeg} command when creating @command{ffserver}.
+
+@var{args} must be a sequence of arguments to be provided to an
+@command{ffmpeg} instance. The first provided argument is ignored, and
+it is replaced by a path with the same dirname of the @command{ffserver}
+instance, followed by the remaining argument and terminated with a
+path corresponding to the feed.
+
+In case you need a more complex @command{ffmpeg} configuration,
+e.g. if you need to generate multiple FFM feeds with a single
+@command{ffmpeg} instance, you should launch @command{ffmpeg} by hand.
+
+This option is ignored in case the commandline option @option{-n} is
+specified.
@item ACL
Specify the list of IP address which are allowed or denied to write