Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 16:11:15 +0000 (18:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 16:11:15 +0000 (18:11 +0200)
commit0726d516dcd1e12d493b402bbe256d8c4b50acc6
tree7d4e275fa24f50688aadf3a91771cc2c0f5b837e
parent215ca864759a54f45265a51ac57dbfd75cb23da2
parent335c31293baec6e6cf5907bd29840af3de8ff735
Merge commit '335c31293baec6e6cf5907bd29840af3de8ff735'

* commit '335c31293baec6e6cf5907bd29840af3de8ff735':
  vf_drawbox: switch to an AVOptions-based system.

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

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