* commit '0c2466de':
  vf_transpose: switch to an AVOptions-based system.

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