aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-06 17:41:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-06 17:41:54 +0100
commit49a5912440db2925a2d4d0a89ad03f882a6e4ca1 (patch)
treecacef84d4c5ab10d50a2278f64e40780b2fb8721 /libavcodec
parentd1dc0d218423c20b2dd880b28fac97627a3ed7e3 (diff)
parente61b8fa5605b16a02a2a0ea75afbfc31d7832bba (diff)
downloadffmpeg-49a5912440db2925a2d4d0a89ad03f882a6e4ca1.tar.gz
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@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions