From aaf6cc925f7f07a20956dbd0c8dc9927e84ac626 Mon Sep 17 00:00:00 2001 From: Lukasz Marek Date: Sat, 15 Nov 2014 18:43:41 +0100 Subject: ffserver: allow skip setting defaults Signed-off-by: Lukasz Marek --- doc/ffserver.texi | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'doc') diff --git a/doc/ffserver.texi b/doc/ffserver.texi index b7c5b6a..83b6520 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. -- cgit v1.1