Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / doc / ffserver.texi

diff --git a/ffmpeg/doc/ffserver.texi b/ffmpeg/doc/ffserver.texi
index 77273d22e105e4143e8a8a8e665458b105bffa90..83b6520dd181fced5a8f4b47eee6d826108faeaa 100644 (file)
--- a/ffmpeg/doc/ffserver.texi
+++ b/ffmpeg/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.
 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
 @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 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.
 @item NoAudio
 @item NoVideo
 Suppress audio/video.


@@ -589,8 +600,9 @@ Set sampling frequency for audio. When using low bitrates, you should
 lower this frequency to 22050 or 11025. The supported frequencies
 depend on the selected audio codec.
 
 lower this frequency to 22050 or 11025. The supported frequencies
 depend on the selected audio codec.
 

-@item AVOptionAudio @var{option} @var{value} (@emph{encoding,audio})
-Set generic option for audio stream.
+@item AVOptionAudio [@var{codec}:]@var{option} @var{value} (@emph{encoding,audio})
+Set generic or private option for audio stream.
+Private option must be prefixed with codec name or codec must be defined before.

 
 @item AVPresetAudio @var{preset} (@emph{encoding,audio})
 Set preset for audio stream.
 
 @item AVPresetAudio @var{preset} (@emph{encoding,audio})
 Set preset for audio stream.


@@ -667,8 +679,9 @@ Set video @option{qdiff} encoding option.
 @item DarkMask @var{float} (@emph{encoding,video})
 Set @option{lumi_mask}/@option{dark_mask} encoding options.
 
 @item DarkMask @var{float} (@emph{encoding,video})
 Set @option{lumi_mask}/@option{dark_mask} encoding options.
 

-@item AVOptionVideo @var{option} @var{value} (@emph{encoding,video})
-Set generic option for video stream.
+@item AVOptionVideo [@var{codec}:]@var{option} @var{value} (@emph{encoding,video})
+Set generic or private option for video stream.
+Private option must be prefixed with codec name or codec must be defined before.

 
 @item AVPresetVideo @var{preset} (@emph{encoding,video})
 Set preset for video stream.
 
 @item AVPresetVideo @var{preset} (@emph{encoding,video})
 Set preset for video stream.