Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki2@gmail.com>2014-11-11 01:21:34 +0300
committerLukasz Marek <lukasz.m.luki2@gmail.com>2014-11-16 03:13:38 +0300
commita38e06c1aaac3002838e19612df375d42cc28a76 (patch)
tree0a9bbb4aa193aa7d35c7b1cbbe49120f25ea9211 /doc/ffserver.texi
parent2657f00d3f99fe624c257b3f46a805478757d778 (diff)
ffserver_config: handle codec private options
This commit allows to set codec's private option. As side effect, it also improves preset support. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Diffstat (limited to 'doc/ffserver.texi')
-rw-r--r--doc/ffserver.texi10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 77273d22e1..b7c5b6aea4 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -589,8 +589,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.
-@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.
@@ -667,8 +668,9 @@ Set video @option{qdiff} encoding option.
@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.