[FFmpeg-cvslog] doc/encoders: alphabetically list the encoders

Timothy Gu git at videolan.org
Wed Aug 28 23:16:19 CEST 2013


ffmpeg | branch: release/1.1 | Timothy Gu <timothygu99 at gmail.com> | Thu Jun 27 18:50:54 2013 -0700| [68c9f5cf64ab58b6b91259ca959dd84c25721f5a] | committer: Timothy Gu

doc/encoders: alphabetically list the encoders

Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 934df3b0375743ae2b03168a4174edb9f88a6889)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

Conflicts:
	doc/encoders.texi

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

 doc/encoders.texi |   74 ++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 9821151..17bb079 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -441,6 +441,43 @@ Enables the the encoder to use (on a frame by frame basis) either L/R
 stereo or mid/side stereo.
 @end multitable
 
+ at section libopencore-amrnb
+
+OpenCORE Adaptive Multi-Rate Narrowband encoder.
+
+Requires the presence of the libopencore-amrnb headers and library during
+configuration. You need to explicitly configure the build with
+ at code{--enable-libopencore-amrnb --enable-version3}.
+
+This is a mono-only encoder. Officially it only supports 8000Hz sample rate,
+but you can override it by setting @option{strict} to @samp{unofficial} or
+lower.
+
+ at subsection Options
+
+ at table @option
+
+ at item b
+Set bitrate in bits per second. Only the following bitrates are supported,
+otherwise libavcodec will round to the nearest valid bitrate.
+
+ at table @option
+ at item 4750
+ at item 5150
+ at item 5900
+ at item 6700
+ at item 7400
+ at item 7950
+ at item 10200
+ at item 12200
+ at end table
+
+ at item dtx
+Allow discontinuous transmission (generate comfort noise) when set to 1. The
+default value is 0 (disabled).
+
+ at end table
+
 @section libtwolame
 
 TwoLAME MP2 encoder wrapper
@@ -563,43 +600,6 @@ default value is 0 (disabled).
 
 @end table
 
- at section libopencore-amrnb
-
-OpenCORE Adaptive Multi-Rate Narrowband encoder.
-
-Requires the presence of the libopencore-amrnb headers and library during
-configuration. You need to explicitly configure the build with
- at code{--enable-libopencore-amrnb --enable-version3}.
-
-This is a mono-only encoder. Officially it only supports 8000Hz sample rate,
-but you can override it by setting @option{strict} to @samp{unofficial} or
-lower.
-
- at subsection Options
-
- at table @option
-
- at item b
-Set bitrate in bits per second. Only the following bitrates are supported,
-otherwise libavcodec will round to the nearest valid bitrate.
-
- at table @option
- at item 4750
- at item 5150
- at item 5900
- at item 6700
- at item 7400
- at item 7950
- at item 10200
- at item 12200
- at end table
-
- at item dtx
-Allow discontinuous transmission (generate comfort noise) when set to 1. The
-default value is 0 (disabled).
-
- at end table
-
 @c man end AUDIO ENCODERS
 
 @chapter Video Encoders



More information about the ffmpeg-cvslog mailing list