Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Apr 2015 18:20:58 +0000 (20:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Apr 2015 18:20:58 +0000 (20:20 +0200)
commit122150168f7d2a1bdc5c208505366d1a9e9c3892
tree3b0284c9b73dab38877cbe16072a56cbf530de44
parent77e794908b18c9598ed3937af00e74c01014bbd9
parent9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386
Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'

* commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386':
  drawtext: Add an alpha option

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

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