Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 20:26:01 +0000 (22:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 20:27:20 +0000 (22:27 +0200)
commite434ddd4c6997aa6185d9dbb781faa2421258f04
treec3a30fd8e1b68ed937980a84326e8e033bac55c7
parent8bdb119197ad50a5ede2326e3c0942dc82ba1b5e
parent9087eaf193b8ce99c41352064a81916fa66adb49
Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'

* commit '9087eaf193b8ce99c41352064a81916fa66adb49':
  vf_overlay: switch to an AVOptions-based system.

Conflicts:
doc/filters.texi
libavfilter/vf_overlay.c

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