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

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