From 98e47c1a7e30e3223f94f41a7ce56a0c8b06e3fd Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefasab@gmail.com>
Date: Fri, 29 Nov 2013 09:36:25 +0100
Subject: [PATCH] doc/ffserver: extend documentation for Feed/File stream
options
---
doc/ffserver.texi | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index e0c075d6d04..4d4b7a88a12 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -396,11 +396,21 @@ to override the encoding options specified by @command{ffserver}, you
can use the @command{ffmpeg} @option{override_ffserver} commandline
option.
+Only one of the @option{Feed} and @option{File} options should be set.
+
@table @option
@item Feed @var{feed_name}
-Set the input feed.
+Set the input feed. @var{feed_name} must correspond to an existing
+feed defined in a @code{Feed} section.
+
+When this option is set, encoding options are used to setup the
+encoding operated by the remote @command{ffmpeg} process.
+
+@item File @var{filename}
+Set the filename of the pre-recorded input file to stream.
-Must be specified for regular streams.
+When this option is set, encoding options are ignored and the input
+file content is re-streamed as is.
@item Format @var{format_name}
Set the format of the output stream.
--
GitLab