* commit '95f1f56a':
  vf_select: switch to an AVOptions-based system.

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