[SCM] libav/experimental: doc: Completely document the x264 options

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e6e8be542b8e9f6c200b55dd1b444ec517dc85da
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Mon Apr 7 01:49:41 2014 +0000

    doc: Completely document the x264 options
    
    And fix an option mismatch.

diff --git a/doc/encoders.texi b/doc/encoders.texi
index d99eda7..94d8340 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -584,25 +584,39 @@ options follow the Libav ones.
 @item g                 @tab keyint
 @tab Maximum GOP size.
 @item qmin              @tab qpmin
+ at tab Minimum quantizer scale.
 @item qmax              @tab qpmax
+ at tab Maximum quantizer scale.
 @item qdiff             @tab qpstep
+ at tab Maximum difference between quantizer scales.
 @item qblur             @tab qblur
+ at tab Quantizer curve blur
 @item qcomp             @tab qcomp
+ at tab Quantizer curve compression factor
 @item refs              @tab ref
+ at tab Number of reference frames each P-frame can use. The range is from @var{0-16}.
 @item sc_threshold      @tab scenecut
+ at tab Sets the threshold for the scene change detection.
 @item trellis           @tab trellis
+ at tab Performs Trellis quantization to increase efficiency. Enabled by default.
 @item nr                @tab nr
 @tab Noise reduction.
 @item me_range          @tab merange
+ at tab Maximum range of the motion search in pixels.
 @item me_method         @tab me
+ at tab Full-pixel motion estimation method.
 @item subq              @tab subme
+ at tab Sub-pixel motion estimation method.
 @item b_strategy        @tab b-adapt
- at item keyint_min        @tab keyint-min
+ at tab Adaptive B-frame placement decision algorithm. Use only on first-pass.
+ at item keyint_min        @tab min-keyint
+ at tab Minimum GOP size.
 @item coder             @tab cabac
 @tab Set coder to @code{ac} to use CABAC.
 @item cmp               @tab chroma-me
 @tab Set to @code{chroma} to use chroma motion estimation.
 @item threads           @tab threads
+ at tab Number of encoding threads.
 @item thread_type       @tab sliced_threads
 @tab Set to @code{slice} to use sliced threading instead of frame threading.
 @item flags -cgop       @tab open-gop

-- 
Libav/FFmpeg packaging