* commit 'b83e9efc':
  vf_unsharp: switch to an AVOptions-based system.

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