[FFmpeg-cvslog] doc/filters: move mcdeint above mergeplanes

Paul B Mahol git at videolan.org
Mon Sep 28 09:25:32 CEST 2015


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Sep 26 22:52:06 2015 +0200| [238ca2d723605bd5756181087551cf7dcd46076b] | committer: Paul B Mahol

doc/filters: move mcdeint above mergeplanes

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 doc/filters.texi |   88 +++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index a5906d6..a4d828e 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -7644,6 +7644,50 @@ copied from first stream.
 By default value 0xf, all planes will be processed.
 @end table
 
+ at section mcdeint
+
+Apply motion-compensation deinterlacing.
+
+It needs one field per frame as input and must thus be used together
+with yadif=1/3 or equivalent.
+
+This filter accepts the following options:
+ at table @option
+ at item mode
+Set the deinterlacing mode.
+
+It accepts one of the following values:
+ at table @samp
+ at item fast
+ at item medium
+ at item slow
+use iterative motion estimation
+ at item extra_slow
+like @samp{slow}, but use multiple reference frames.
+ at end table
+Default value is @samp{fast}.
+
+ at item parity
+Set the picture field parity assumed for the input video. It must be
+one of the following values:
+
+ at table @samp
+ at item 0, tff
+assume top field first
+ at item 1, bff
+assume bottom field first
+ at end table
+
+Default value is @samp{bff}.
+
+ at item qp
+Set per-block quantization parameter (QP) used by the internal
+encoder.
+
+Higher values should result in a smoother motion vector field but less
+optimal individual vectors. Default value is 1.
+ at end table
+
 @section mergeplanes
 
 Merge color channel components from several video streams.
@@ -7703,50 +7747,6 @@ format=rgb24,mergeplanes=0x000102:yuv444p
 @end example
 @end itemize
 
- at section mcdeint
-
-Apply motion-compensation deinterlacing.
-
-It needs one field per frame as input and must thus be used together
-with yadif=1/3 or equivalent.
-
-This filter accepts the following options:
- at table @option
- at item mode
-Set the deinterlacing mode.
-
-It accepts one of the following values:
- at table @samp
- at item fast
- at item medium
- at item slow
-use iterative motion estimation
- at item extra_slow
-like @samp{slow}, but use multiple reference frames.
- at end table
-Default value is @samp{fast}.
-
- at item parity
-Set the picture field parity assumed for the input video. It must be
-one of the following values:
-
- at table @samp
- at item 0, tff
-assume top field first
- at item 1, bff
-assume bottom field first
- at end table
-
-Default value is @samp{bff}.
-
- at item qp
-Set per-block quantization parameter (QP) used by the internal
-encoder.
-
-Higher values should result in a smoother motion vector field but less
-optimal individual vectors. Default value is 1.
- at end table
-
 @section mpdecimate
 
 Drop frames that do not differ greatly from the previous frame in



More information about the ffmpeg-cvslog mailing list