Michael Niedermayer 122150168f 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>
2015-04-21 20:20:58 +02:00
..
2015-01-12 01:18:01 +01:00
2014-07-20 02:01:50 +02:00
2015-01-07 17:17:33 -09:00
2015-03-23 13:16:42 +01:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2013-02-14 23:45:48 +01:00
2015-02-02 05:04:14 +01:00
2015-04-11 01:00:07 +02:00