[FFmpeg-cvslog] doc/ffserver: reorder encoding options, and mark them as such
Stefano Sabatini
git at videolan.org
Fri Nov 29 10:29:16 CET 2013
ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Fri Nov 29 08:00:25 2013 +0100| [cdff4c53137fbce89efd4ac1d4a0b4923c9de666] | committer: Stefano Sabatini
doc/ffserver: reorder encoding options, and mark them as such
Also add notice about ffmpeg -override_ffserver option.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cdff4c53137fbce89efd4ac1d4a0b4923c9de666
---
doc/ffserver.texi | 84 +++++++++++++++++++++++++++++++----------------------
1 file changed, 49 insertions(+), 35 deletions(-)
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 57aeca8..562e6c5 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -388,6 +388,14 @@ where @var{STREAM_NAME} specifies the unique name of the stream.
The following options are recognized within a Stream section.
+Encoding options are marked with the @emph{encoding} tag, and they are
+used to set the encoding parameters, and are mapped to libavcodec
+encoding options. Not all encoding options are supported, in
+particular it is not possible to set encoder private options. In order
+to override the encoding options specified by @command{ffserver}, you
+can use the @command{ffmpeg} @option{override_ffserver} commandline
+option.
+
@table @option
@item Feed @var{feed_name}
Set the input feed.
@@ -449,97 +457,103 @@ Set metadata corresponding to the option.
@item NoVideo
Suppress audio/video.
- at item AudioBitRate @var{rate}
+ at item AudioCodec @var{codec_name} (@emph{encoding,audio})
+Set audio codec.
+
+ at item AudioBitRate @var{rate} (@emph{encoding,audio})
Set bitrate for the audio stream in kbits per second.
- at item AudioChannels @var{n}
+ at item AudioChannels @var{n} (@emph{encoding,audio})
Set number of audio channels.
- at item AudioSampleRate @var{n}
+ at item AudioSampleRate @var{n} (@emph{encoding,audio})
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.
- at item VideoBitRate @var{n}
+ at item AVOptionAudio @var{option} @var{value} (@emph{encoding,audio})
+Set generic option for audio stream.
+
+ at item AVPresetAudio @var{preset} (@emph{encoding,audio})
+Set preset for audio stream.
+
+ at item VideoCodec @var{codec_name} (@emph{encoding,video})
+Set video codec.
+
+ at item VideoBitRate @var{n} (@emph{encoding,video})
Set bitrate for the video stream in kbits per second.
- at item VideoBitRateRange @var{range}
+ at item VideoBitRateRange @var{range} (@emph{encoding,video})
Set video bitrate range.
A range must be specified in the form @var{minrate}- at var{maxrate}, and
specifies the @option{minrate} and @option{maxrate} encoding options
expressed in kbits per second.
- at item VideoBitRateRangeTolerance @var{n}
+ at item VideoBitRateRangeTolerance @var{n} (@emph{encoding,video})
Set video bitrate tolerance in kbits per second.
- at item PixelFormat @var{pixel_format}
+ at item PixelFormat @var{pixel_format} (@emph{encoding,video})
Set video pixel format.
- at item Debug @var{integer}
+ at item Debug @var{integer} (@emph{encoding,video})
Set video @option{debug} encoding option.
- at item Strict @var{integer}
+ at item Strict @var{integer} (@emph{encoding,video})
Set video @option{strict} encoding option.
- at item VideoBufferSize @var{n}
+ at item VideoBufferSize @var{n} (@emph{encoding,video})
Set ratecontrol buffer size, expressed in KB.
- at item VideoFrameRate @var{n}
+ at item VideoFrameRate @var{n} (@emph{encoding,video})
Set number of video frames per second.
- at item VideoSize
+ at item VideoSize (@emph{encoding,video})
Set size of the video frame, must be an abbreviation or in the form
@var{W}x at var{H}. See @ref{video size syntax,,the Video size section
in the ffmpeg-utils(1) manual,ffmpeg-utils}.
Default value is @code{160x128}.
- at item VideoIntraOnly
+ at item VideoIntraOnly (@emph{encoding,video})
Transmit only intra frames (useful for low bitrates, but kills frame rate).
- at item VideoGopSize @var{n}
+ at item VideoGopSize @var{n} (@emph{encoding,video})
If non-intra only, an intra frame is transmitted every VideoGopSize
frames. Video synchronization can only begin at an intra frame.
- at item VideoTag @var{tag}
+ at item VideoTag @var{tag} (@emph{encoding,video})
Set video tag.
- at item VideoHighQuality
- at item Video4MotionVector
+ at item VideoHighQuality (@emph{encoding,video})
+ at item Video4MotionVector (@emph{encoding,video})
- at item BitExact
+ at item BitExact (@emph{encoding,video})
Set bitexact encoding flag.
- at item IdctSimple
+ at item IdctSimple (@emph{encoding,video})
Set simple IDCT algorithm.
- at item Qscale @var{n}
+ at item Qscale @var{n} (@emph{encoding,video})
Enable constant quality encoding, and set video qscale (quantization
scale) value, expressed in @var{n} QP units.
- at item VideoQMin @var{n}
- at item VideoQMax @var{n}
+ at item VideoQMin @var{n} (@emph{encoding,video})
+ at item VideoQMax @var{n} (@emph{encoding,video})
Set video qmin/qmax.
- at item VideoQDiff @var{integer}
+ at item VideoQDiff @var{integer} (@emph{encoding,video})
Set video @option{qdiff} encoding option.
- at item LumiMask @var{float}
- at item DarkMask @var{float}
+ at item LumiMask @var{float} (@emph{encoding,video})
+ at item DarkMask @var{float} (@emph{encoding,video})
Set @option{lumi_mask}/@option{dark_mask} encoding options.
- at item AudioCodec @var{codec_name}
- at item VideoCodec @var{codec_name}
-Set audio/video codec.
-
- at item AVOptionAudio @var{option} @var{value}
- at item AVOptionVideo @var{option} @var{value}
-Set generic option for audio/video stream.
+ at item AVOptionVideo @var{option} @var{value} (@emph{encoding,video})
+Set generic option for video stream.
- at item AVPresetAudio @var{preset}
- at item AVOptionVideo @var{preset}
-Set preset for audio/video stream.
+ at item AVPresetVideo @var{preset} (@emph{encoding,video})
+Set preset for video stream.
@var{preset} must be the path of a preset file.
@end table
More information about the ffmpeg-cvslog
mailing list