Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 16:27:40 +0000 (18:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 16:31:14 +0000 (18:31 +0200)
commitd70b4944223831c17a37680bbd9d3caca1c32659
tree3e4b3b07e6c12924ae6ad3c52ee5878798c1ec3d
parent0726d516dcd1e12d493b402bbe256d8c4b50acc6
parent8ec464c61c46a5d088b43d24e384d6c37b7ef14a
Merge commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a'

* commit '8ec464c61c46a5d088b43d24e384d6c37b7ef14a':
  vf_drawtext: switch to an AVOptions-based system.

Conflicts:
libavfilter/vf_drawtext.c

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