summaryrefslogtreecommitdiff
path: root/doc/ffserver.texi
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki2@gmail.com>2014-11-15 18:43:41 +0100
committerLukasz Marek <lukasz.m.luki2@gmail.com>2014-11-26 23:32:33 +0100
commitaaf6cc925f7f07a20956dbd0c8dc9927e84ac626 (patch)
tree99d3e18983163fe54769eaaae569224478b19990 /doc/ffserver.texi
parent6c2ed67c2f6f93fe153afba40b29a18d2cff0bd0 (diff)
ffserver: allow skip setting defaults
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Diffstat (limited to 'doc/ffserver.texi')
-rw-r--r--doc/ffserver.texi11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index b7c5b6aea4..83b6520dd1 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -408,6 +408,12 @@ ignored, and the log is written to standard output.
Set no-daemon mode. This option is currently ignored since now
@command{ffserver} will always work in no-daemon mode, and is
deprecated.
+
+@item UseDefaults
+@item NoDefaults
+Control whether default codec options are used for the all streams or not.
+Each stream may overwrite this setting for its own. Default is @var{UseDefaults}.
+The lastest occurrence overrides previous if multiple definitions.
@end table
@section Feed section
@@ -571,6 +577,11 @@ deprecated in favor of @option{Metadata}.
@item Metadata @var{key} @var{value}
Set metadata value on the output stream.
+@item UseDefaults
+@item NoDefaults
+Control whether default codec options are used for the stream or not.
+Default is @var{UseDefaults} unless disabled globally.
+
@item NoAudio
@item NoVideo
Suppress audio/video.