ffmpeg/libavfilter
Michael Niedermayer 443261cbbd Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'
* commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432':
  drawtext: Add fontconfig support

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

See: 40b7a27bad8b8b35cb215bf4f4cba02a00d6f9e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-17 05:15:26 +02:00
..
2014-02-26 16:37:59 +00:00
2014-02-26 16:37:59 +00:00
2014-01-19 17:12:40 +01:00
2014-02-26 16:37:59 +00:00
2014-01-19 17:12:50 +01:00
2013-01-05 05:21:44 +01:00
2013-09-30 08:47:40 +00:00
2013-09-12 14:01:43 +00:00
2013-11-10 19:16:45 +01:00
2013-12-03 04:09:10 +01:00
2014-02-07 09:33:56 +01:00
2014-03-31 03:22:20 +02:00
2013-06-14 01:27:22 +02:00
2014-01-19 17:13:02 +01:00