* qatar/master:
  avfilter: allow setpts filter to use wallclock time for calculations

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