* commit 'f13ab299':
  vf_fps: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>