har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

doc/ffserver: extend documentation for Feed/File stream options

Browse Source
This commit is contained in:
Stefano Sabatini 2013-11-29 09:36:25 +01:00
parent 0e64edda18
commit 98e47c1a7e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/ffserver.texi
View File

@ -396,11 +396,21 @@ to override the encoding options specified by @command{ffserver}, you
can use the @command{ffmpeg} @option{override_ffserver} commandline can use the @command{ffmpeg} @option{override_ffserver} commandline
option. option.
Only one of the @option{Feed} and @option{File} options should be set.
@table @option @table @option
@item Feed @var{feed_name} @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.
Must be specified for regular streams. 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.
When this option is set, encoding options are ignored and the input
file content is re-streamed as is.
@item Format @var{format_name} @item Format @var{format_name}
Set the format of the output stream. Set the format of the output stream.