diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 03:42:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-17 05:15:26 +0200 |
| commit | 443261cbbdaac2eaba5fada318fa596bd5ab3e4a (patch) | |
| tree | da5265cf2dc4cde37afeb1b816625f728b9e525d /libavresample/x86 | |
| parent | c150e2cf324ce0572bb8b9b3501c45465cfbf360 (diff) | |
| parent | f1b239ec8b38474d31f3bfea1f0b1693774fa432 (diff) | |
| download | ffmpeg-443261cbbdaac2eaba5fada318fa596bd5ab3e4a.tar.gz | |
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>
Diffstat (limited to 'libavresample/x86')
0 files changed, 0 insertions, 0 deletions