Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 16:48:07 +0000 (18:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 16:48:07 +0000 (18:48 +0200)
commit0c3d706bdb2276d39cb4e07784ce58664dbc5485
tree4903dce3261b05b5851041422b72c4a7bb9e2284
parentd70b4944223831c17a37680bbd9d3caca1c32659
parentb9dfee9fa259dfc885508179a359dccc9e7840bd
Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'

* commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd':
  vf_fade: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavfilter/avfilter.c
libavfilter/vf_fade.c