* commit '460e7b4f':
  vf_cropdetect: switch to an AVOptions-based system.

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