[FFmpeg-cvslog] doc: fix and clarify libx264 encoding.

Clément Bœsch git at videolan.org
Sun Oct 30 02:09:37 CEST 2011


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sun Oct 30 02:05:29 2011 +0200| [e1d613515b77e6e603e8a172cd8d295856d59f24] | committer: Clément Bœsch

doc: fix and clarify libx264 encoding.

tune, fastfirstpass and profile are not available through x264opts.
Since some FFmpeg options don't match the names used in libx264, add
libx264 option names as a reference when needed. And last thing, x264
don't have a manpage ATM, so prefer the x264 --fullhelp over the
unexistant manpage reference.

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

 doc/encoders.texi |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 3607bb1..f132eae 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -551,15 +551,12 @@ Set the encoding preset.
 
 @item tune @var{tune_name}
 Tune the encoding params.
-Deprecated in favor of @var{x264opts}
 
 @item fastfirstpass @var{bool}
 Use fast settings when encoding first pass, default value is 1.
-Deprecated in favor of @var{x264opts}.
 
 @item profile @var{profile_name}
 Set profile restrictions.
-Deprecated in favor of @var{x264opts}.
 
 @item level @var{level}
 Specify level (as defined by Annex A).
@@ -567,14 +564,14 @@ Deprecated in favor of @var{x264opts}.
 
 @item passlogfile @var{filename}
 Specify filename for 2 pass stats.
-Deprecated in favor of @var{x264opts}.
+Deprecated in favor of @var{x264opts} (see @var{stats} libx264 option).
 
 @item wpredp @var{wpred_type}
 Specify Weighted prediction for P-frames.
-Deprecated in favor of @var{x264opts}.
+Deprecated in favor of @var{x264opts} (see @var{weightp} libx264 option).
 
 @item x264opts @var{options}
-Allow to set any x264 option, see x264 manual for a list.
+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
 ":".



More information about the ffmpeg-cvslog mailing list