Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'

* commit '7536c671040f1f3ebc9f0d3b7831dac71436b775':
  vf_yadif: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/vf_yadif.c
	libavfilter/yadif.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 5 insertions, 9 deletions

diff --git a/doc/filters.texi b/doc/filters.texi
index 4a40e931d0..5f85ac006a 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5668,17 +5668,13 @@ ffmpeg -i in.avi -vf "vflip" out.avi
 Deinterlace the input video ("yadif" means "yet another deinterlacing
 filter").
 
-The filter accepts parameters as a list of @var{key}=@var{value}
-pairs, separated by ":". If the key of the first options is omitted,
-the arguments are interpreted according to syntax
-@var{mode}:@var{parity}:@var{deint}.
+This filter accepts the following options:
 
-The description of the accepted parameters follows.
 
 @table @option
+
 @item mode
-Specify the interlacing mode to adopt. Accept one of the following
-values:
+The interlacing mode to adopt, accepts one of the following values:
 
 @table @option
 @item 0, send_frame
@@ -5694,8 +5690,8 @@ like @code{send_field} but skip spatial interlacing check
 Default value is @code{send_frame}.
 
 @item parity
-Specify the picture field parity assumed for the input interlaced
-video. Accept one of the following values:
+The picture field parity assumed for the input interlaced video, accepts one of
+the following values:
 
 @table @option
 @item 0, tff