Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'

[ffmpeg] / doc / encoders.texi

diff --git a/doc/encoders.texi b/doc/encoders.texi
index a7a2761f1d381a7bb4114ad28b1a4f6cc59c5810..da44c1760a179258259df6d773d8d111556a96e3 100644 (file)
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -420,6 +420,45 @@ Selected by Encoder (default)
 A description of some of the currently available video encoders
 follows.
 
+@section libtheora
+
+Theora format supported through libtheora.
+
+Requires the presence of the libtheora headers and library during
+configuration. You need to explicitly configure the build with
+@code{--enable-libtheora}.
+
+@subsection Options
+
+The following global options are mapped to internal libtheora options
+which affect the quality and the bitrate of the encoded stream.
+
+@table @option
+@item b
+Set the video bitrate, only works if the @code{qscale} flag in
+@option{flags} is not enabled.
+
+@item flags
+Used to enable constant quality mode encoding through the
+@option{qscale} flag, and to enable the @code{pass1} and @code{pass2}
+modes.
+
+@item g
+Set the GOP size.
+
+@item global_quality
+Set the global quality in lambda units, only works if the
+@code{qscale} flag in @option{flags} is enabled. The value is clipped
+in the [0 - 10*@code{FF_QP2LAMBDA}] range, and then multiplied for 6.3
+to get a value in the native libtheora range [0-63].
+
+For example, to set maximum constant quality encoding with
+@command{ffmpeg}:
+@example
+ffmpeg -i INPUT -flags:v qscale -global_quality:v "10*QP2LAMBDA" -codec:v libtheora OUTPUT.ogg
+@end example
+@end table
+
 @section libvpx
 
 VP8 format supported through libvpx.
@@ -580,7 +619,9 @@ Deprecated in favor of @var{x264opts} (see @var{weightp} libx264 option).
 Allow to set any x264 option, see x264 --fullhelp for a list.
 
 @var{options} is a list of @var{key}=@var{value} couples separated by
-":".
+":". In @var{filter} and @var{psy-rd} options that use ":" as a separator
+themselves, use "," instead. They accept it as well since long ago but this
+is kept undocumented for some reason.
 @end table
 
 For example to specify libx264 encoding options with @command{ffmpeg}: