Merge commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 19:24:00 +0000 (21:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 19:25:01 +0000 (21:25 +0200)
commit94ec709e3bdd37368ecfc2973ff931fa4cb775c0
tree2881b2c8f938b0c2c7aa44f0471b6d9dd6214df1
parentf780a90355aa19256f37df9359a58140a9b4a6b3
parentee0e8d4b15a87932ab6066cd6eae3cab08726319
Merge commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319'

* commit 'ee0e8d4b15a87932ab6066cd6eae3cab08726319':
  vf_libopencv: switch to an AVOptions-based system.

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