Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 01:42:17 +0000 (03:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 03:15:26 +0000 (05:15 +0200)
commit443261cbbdaac2eaba5fada318fa596bd5ab3e4a
treeda5265cf2dc4cde37afeb1b816625f728b9e525d
parentc150e2cf324ce0572bb8b9b3501c45465cfbf360
parentf1b239ec8b38474d31f3bfea1f0b1693774fa432
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>
configure
doc/filters.texi
libavfilter/vf_drawtext.c