Merge commit '7536c671040f1f3ebc9f0d3b7831dac71436b775'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 23:14:01 +0000 (01:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 23:18:18 +0000 (01:18 +0200)
commitab6091f8e21df7280f2b50fd6226bbc130fb060a
treec4fbd5b558abb6993e5aeb9b6dd3eeca095c86f7
parent8ac7090c233c0677e59ee5cf7a5817e02c9ec914
parent7536c671040f1f3ebc9f0d3b7831dac71436b775
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>
doc/filters.texi
libavfilter/avfilter.c
libavfilter/vf_yadif.c