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-04-08 15:35:14 +02:00
2014-04-15 02:37:40 +02:00
2013-12-14 21:47:51 +01:00
2014-01-09 12:12:10 +01:00
2014-03-27 03:58:29 +01:00
2014-04-12 04:52:01 +02:00
2013-12-23 12:52:50 +01:00
2014-01-09 12:12:10 +01:00
2014-02-17 02:22:01 +01:00
2014-02-14 14:38:21 +01:00
2014-04-09 04:54:26 +02:00
2014-01-03 17:05:44 +01:00
2014-03-06 21:12:40 +01:00
2014-03-06 21:12:40 +01:00
2014-04-03 19:25:15 +02:00
2014-02-10 13:26:31 +01:00
2014-01-09 12:12:10 +01:00
2013-12-15 10:46:46 +01:00
2013-12-16 19:18:45 +01:00
2014-03-27 03:58:56 +01:00
2014-03-13 14:21:27 +01:00
2014-04-17 05:15:26 +02:00
2014-02-24 19:46:11 +01:00
2014-04-15 20:35:57 +02:00
2014-03-06 21:12:40 +01:00
2014-04-11 17:51:33 +02:00
2014-04-12 14:34:11 +02:00
2014-03-17 20:56:33 +01:00
2014-03-06 21:12:40 +01:00
2014-03-22 23:26:23 +01:00
2014-03-27 03:58:56 +01:00
2014-03-12 23:08:41 +01:00
2014-03-25 17:53:14 +01:00
2014-03-23 17:30:52 +01:00
2014-03-25 13:48:06 +01:00
2014-04-09 04:26:20 +02:00
2014-03-06 21:12:40 +01:00