Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 10:41:06 +0000 (12:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 10:41:06 +0000 (12:41 +0200)
commit0594ef0deab75ad1fdf92548b907079659ce50f5
tree0d879a36db6b0d0c466cda49ff04a1dd1fd1899f
parent2a7f885fe1cfaaefe35252d68366d0d5709cd745
parentb439c992c23f3e0f3832fffd2a34a664b236c525
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>
doc/filters.texi
libavcodec/dfa.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/version.h