* commit 'b439c992':
  lavfi: switch to an AVOptions-based system.
  dfa: implement missing TDLT coding method

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