* commit 'dd7fc37c':
  af_join: switch to an AVOptions-based system.

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