[FFmpeg-cvslog] Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 18:48:07 2013 +0200| [0c3d706bdb2276d39cb4e07784ce58664dbc5485] | committer: Michael Niedermayer

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 at gmx.at>

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