[FFmpeg-cvslog] doc/encoders: reformat and add some clarification in libtwolame doc

Timothy Gu git at videolan.org
Mon Sep 23 22:40:09 CEST 2013


ffmpeg | branch: release/2.0 | Timothy Gu <timothygu99 at gmail.com> | Sat Aug  3 16:55:40 2013 -0700| [01b39884c7f04d0b8e836608eb623788540c9444] | committer: Timothy Gu

doc/encoders: reformat and add some clarification in libtwolame doc

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit e45e72f5f89ef5a5791562cfcb935028b46ecd0a)

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

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

 doc/encoders.texi |   56 +++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 44b0dfc..5b1a35f 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -496,24 +496,26 @@ Requires the presence of the libtwolame headers and library during
 configuration. You need to explicitly configure the build with
 @code{--enable-libtwolame}.
 
- at subsection Options Mapping
+ at subsection Options
 
 The following options are supported by the libtwolame wrapper. The
-TwoLAME-equivalent options follow the FFmpeg ones and are in
+ at command{twolame}-equivalent options follow the FFmpeg ones and are in
 parentheses.
 
 @table @option
- at item b
-(b) Set bitrate in bits/s. Note that FFmpeg @code{b} option is
-expressed in bits/s, twolame @code{b} in kilobits/s. The default
-value is 128k.
+ at item b (@emph{-b})
+Set bitrate expressed in bits/s for CBR. @command{twolame} @option{b}
+option is expressed in kilobits/s. Default value is 128k.
 
- at item q
-(V) Set quality for experimental VBR support. Maximum value range is
-from -50 to 50, useful range is from -10 to 10.
+ at item q (@emph{-V})
+Set quality for experimental VBR support. Maximum value range is
+from -50 to 50, useful range is from -10 to 10. The higher the
+value, the better the quality. This option is valid only using the
+ at command{ffmpeg} command-line tool. For library interface users,
+use @option{global_quality}.
 
- at item mode
-(mode) Set MPEG mode. Possible values:
+ at item mode (@emph{--mode})
+Set the mode of the resulting audio. Possible values:
 
 @table @samp
 @item auto
@@ -528,26 +530,26 @@ Dual channel
 Mono
 @end table
 
- at item psymodel
-(psyc-mode) Set psychoacoustic model to use in encoding. The argument
-must be an integer between -1 and 4, inclusive. The higher the value,
-the better the quality. The default value is 3.
+ at item psymodel (@emph{--psyc-mode})
+Set psychoacoustic model to use in encoding. The argument must be
+an integer between -1 and 4, inclusive. The higher the value, the
+better the quality. The default value is 3.
 
- at item energy_levels
-(energy) Enable energy levels extensions when set to 1. The default
-value is 0 (disabled).
+ at item energy_levels (@emph{--energy})
+Enable energy levels extensions when set to 1. The default value is
+0 (disabled).
 
- at item error_protection
-(protect) Enable CRC error protection when set to 1. The default value
-is 0 (disabled).
+ at item error_protection (@emph{--protect})
+Enable CRC error protection when set to 1. The default value is 0
+(disabled).
 
- at item copyright
-(copyright) Set MPEG audio copyright flag when set to 1. The default
-value is 0 (disabled).
+ at item copyright (@emph{--copyright})
+Set MPEG audio copyright flag when set to 1. The default value is 0
+(disabled).
 
- at item original
-(original) Set MPEG audio original flag when set to 1. The default
-value is 0 (disabled).
+ at item original (@emph{--original})
+Set MPEG audio original flag when set to 1. The default value is 0
+(disabled).
 
 @end table
 



More information about the ffmpeg-cvslog mailing list