* commit '33b97faa':
  vf_setpts: switch to an AVOptions-based system.

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