[FFmpeg-cvslog] doc/ffserver: document "Launch" feed option

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Nov 28 18:49:27 2013 +0100| [4e39962f0c396c5760b81be0c0c3bf3c0c2a46e4] | committer: Stefano Sabatini

doc/ffserver: document "Launch" feed option

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e39962f0c396c5760b81be0c0c3bf3c0c2a46e4
---

 doc/ffserver.texi |   16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 1506742..007b098 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.
 
- at item Launch
+ at item Launch @var{args}
+Launch an @command{ffmpeg} command when creating @command{ffserver}.
+
+ at var{args} must be a sequence of arguments to be provided to an
+ at 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
+ at 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