mirror of https://git.ffmpeg.org/ffmpeg.git
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: cea5812fa7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
49a5912440