[FFmpeg-cvslog] doc/ffserver: reorder/extend stream video encoding options

[Stefano Sabatini]

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Nov 28 23:48:27 2013 +0100| [a42c20f089cc66727f6c69d406e5080218a2b044] | committer: Stefano Sabatini

doc/ffserver: reorder/extend stream video encoding options

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a42c20f089cc66727f6c69d406e5080218a2b044
---

 doc/ffserver.texi |   39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index aeb5a73..6fe4b73 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -413,12 +413,19 @@ specifies the @option{minrate} and @option{maxrate} encoding options
 expressed in kbits per second.
 
 @item VideoBitRateRangeTolerance @var{n}
+Set video bitrate tolerance in kbits per second.
 
- at item PixelFormat
+ at item PixelFormat @var{pixel_format}
 Set video pixel format.
 
+ at item Debug @var{integer}
+Set video @option{debug} encoding option.
+
+ at item Strict @var{integer}
+Set video @option{strict} encoding option.
+
 @item VideoBufferSize @var{n}
-Set ratecontrol buffer size.
+Set ratecontrol buffer size, expressed in KB.
 
 @item VideoFrameRate @var{n}
 Set number of video frames per second.
@@ -437,9 +444,33 @@ Transmit only intra frames (useful for low bitrates, but kills frame rate).
 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}
+Set video tag.
+
 @item VideoHighQuality
 @item Video4MotionVector
 
+ at item BitExact
+Set bitexact encoding flag.
+
+ at item IdctSimple
+Set simple IDCT algorithm.
+
+ at item Qscale @var{n}
+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}
+Set video qmin/qmax.
+
+ at item VideoQDiff @var{integer}
+Set video @option{qdiff} encoding option.
+
+ at item LumiMask @var{float}
+ at item DarkMask @var{float}
+Set @option{lumi_mask}/@option{dark_mask} encoding options.
+
 @item AudioCodec @var{codec_name}
 @item VideoCodec @var{codec_name}
 Set audio/video codec.
@@ -448,10 +479,6 @@ Set audio/video codec.
 @item NoVideo
 Suppress audio/video.
 
- at item VideoQMin @var{n}
- at item VideoQMax @var{n}
-Set video qmin/qmax.
-
 @item AVOptionAudio @var{option} @var{value}
 @item AVOptionVideo @var{option} @var{value}
 Set generic option for audio/video stream.