Michael Niedermayer 0594ef0dea Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525' ...

* commit 'b439c992c23f3e0f3832fffd2a34a664b236c525':
  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>

2013-04-10 12:41:06 +02:00

13 KiB

Raw Blame History

View Raw