RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  doc: Completely document the x264 options

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-09 04:54:26 +02:00
parent 43935842bd e6e8be542b
commit 624327988f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/encoders.texi
View File

@ -1566,25 +1566,34 @@ kilobits/s.
@item g (@emph{keyint}) @item g (@emph{keyint})
@item qmax (@emph{qpmax})
@item qmin (@emph{qpmin}) @item qmin (@emph{qpmin})
Minimum quantizer scale.
@item qmax (@emph{qpmax})
Maximum quantizer scale.
@item qdiff (@emph{qpstep}) @item qdiff (@emph{qpstep})
Maximum difference between quantizer scales.
@item qblur (@emph{qblur}) @item qblur (@emph{qblur})
Quantizer curve blur
@item qcomp (@emph{qcomp}) @item qcomp (@emph{qcomp})
Quantizer curve compression factor
@item refs (@emph{ref}) @item refs (@emph{ref})
Number of reference frames each P-frame can use. The range is from @var{0-16}.
@item sc_threshold (@emph{scenecut}) @item sc_threshold (@emph{scenecut})
Sets the threshold for the scene change detection.
@item trellis (@emph{trellis}) @item trellis (@emph{trellis})
Performs Trellis quantization to increase efficiency. Enabled by default.
@item nr (@emph{nr}) @item nr (@emph{nr})
@item me_range (@emph{merange}) @item me_range (@emph{merange})
Maximum range of the motion search in pixels.
@item me_method (@emph{me}) @item me_method (@emph{me})
Set motion estimation method. Possible values in the decreasing order Set motion estimation method. Possible values in the decreasing order
@ -1606,10 +1615,13 @@ Hadamard exhaustive search (slowest).
@end table @end table
@item subq (@emph{subme}) @item subq (@emph{subme})
Sub-pixel motion estimation method.
@item b_strategy (@emph{b-adapt}) @item b_strategy (@emph{b-adapt})
Adaptive B-frame placement decision algorithm. Use only on first-pass.
@item keyint_min (@emph{min-keyint}) @item keyint_min (@emph{min-keyint})
Minimum GOP size.
@item coder @item coder
Set entropy encoder. Possible values: Set entropy encoder. Possible values:
@ -1636,6 +1648,7 @@ Ignore chroma in motion estimation. It generates the same effect as
@end table @end table
@item threads (@emph{threads}) @item threads (@emph{threads})
Number of encoding threads.
@item thread_type @item thread_type
Set multithreading technique. Possible values: Set multithreading technique. Possible values: