[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Mon Jan 6 17:49:51 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 17:41:54 2014 +0100| [49a5912440db2925a2d4d0a89ad03f882a6e4ca1] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Update freetype check to follow upstream

Conflicts:
	configure

Not merged, as its broken (Reported by ubitux)

See: cea5812fa723c08b89d929eeba73462e05de2973
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list