Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 19:13:27 +0000 (21:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 19:14:30 +0000 (21:14 +0200)
commitf780a90355aa19256f37df9359a58140a9b4a6b3
tree099d032ec50e0bfa8a86785da92d7315a35a81c3
parent1ee9eacaa492a0f38ae426439516574f4bfae4d9
parent8c747d46f721cffa8ea51990805ad1d3a3a4fd0a
Merge commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a'

* commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a':
  vf_hqdn3d: switch to an AVOptions-based system.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi
libavfilter/avfilter.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_hqdn3d.h