Merge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 14:28:23 +0000 (16:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 14:34:44 +0000 (16:34 +0200)
commiteb6d58d23c557fe53b6b26f9e0b2350c1046b56d
tree607c81046e7436948e744fa775f8ea3ed283e6ce
parenta3cb303a4c2235c4325130bae16c6e84bc4c9c15
parent51def31dbe5b6e857536de8fa428f263d64f3ae5
Merge commit '51def31dbe5b6e857536de8fa428f263d64f3ae5'

* commit '51def31dbe5b6e857536de8fa428f263d64f3ae5':
  vf_boxblur: switch to an AVOptions-based system.

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

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