diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-11-29 09:36:25 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-11-29 10:28:03 +0100 |
| commit | 98e47c1a7e30e3223f94f41a7ce56a0c8b06e3fd (patch) | |
| tree | f1bb25af6f249d51cd89144855f32bae8d4e602e | |
| parent | 0e64edda183a64b6441b85aa746b9ae1650ab95a (diff) | |
| download | ffmpeg-98e47c1a7e30e3223f94f41a7ce56a0c8b06e3fd.tar.gz | |
doc/ffserver: extend documentation for Feed/File stream options
| -rw-r--r-- | doc/ffserver.texi | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi index e0c075d6d0..4d4b7a88a1 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. |