aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-11-28 23:48:27 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-11-29 00:04:17 +0100
commita42c20f089cc66727f6c69d406e5080218a2b044 (patch)
treea05b28cff9dd04624d40a8e6e2a499bb26037b07
parentb9a3ac89c8d6f78fba525724daa3025f892ecaa0 (diff)
downloadffmpeg-a42c20f089cc66727f6c69d406e5080218a2b044.tar.gz
doc/ffserver: reorder/extend stream video encoding options
-rw-r--r--doc/ffserver.texi39
1 files changed, 33 insertions, 6 deletions
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index aeb5a73d05..6fe4b73a10 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.
-@item PixelFormat
+@item PixelFormat @var{pixel_format}
Set video pixel format.
+@item Debug @var{integer}
+Set video @option{debug} encoding option.
+
+@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.
+@item VideoTag @var{tag}
+Set video tag.
+
@item VideoHighQuality
@item Video4MotionVector
+@item BitExact
+Set bitexact encoding flag.
+
+@item IdctSimple
+Set simple IDCT algorithm.
+
+@item Qscale @var{n}
+Enable constant quality encoding, and set video qscale (quantization
+scale) value, expressed in @var{n} QP units.
+
+@item VideoQMin @var{n}
+@item VideoQMax @var{n}
+Set video qmin/qmax.
+
+@item VideoQDiff @var{integer}
+Set video @option{qdiff} encoding option.
+
+@item LumiMask @var{float}
+@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.
-@item VideoQMin @var{n}
-@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.