ffmpeg/libavfilter
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-04-11 20:39:43 +00:00
2015-04-11 20:39:43 +00:00
2014-05-03 20:08:18 +02:00
2015-03-18 12:19:08 +01:00
2014-06-03 10:58:19 -08:00
2013-09-30 08:47:40 +00:00
2014-08-13 01:00:38 +02:00
2015-04-11 20:39:43 +00:00
2015-01-06 10:02:11 +00:00
2015-01-05 01:45:49 +01:00
2015-04-11 20:39:43 +00:00
2015-03-20 09:41:32 +01:00
2015-03-20 09:41:32 +01:00
2014-12-26 15:39:51 -03:00
2015-01-09 17:26:31 +01:00
2015-04-21 14:11:30 +02:00