[FFmpeg-cvslog] Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'

Michael Niedermayer git at videolan.org
Thu Apr 17 05:57:19 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 17 03:42:17 2014 +0200| [443261cbbdaac2eaba5fada318fa596bd5ab3e4a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=443261cbbdaac2eaba5fada318fa596bd5ab3e4a
---





More information about the ffmpeg-cvslog mailing list