diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:06:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:06:52 +0200 |
| commit | 4ccde2d356e73430738380cb8b94575bdf707f9b (patch) | |
| tree | 732bdb68e4a952772d4330284f8d5fe187ee4dce /libavutil/parseutils.c | |
| parent | fb487e2f6668ccb67100acc7a9b86f68af9c523b (diff) | |
| parent | b00444c0bbbc78ae477ec697d6569893609f420d (diff) | |
| download | ffmpeg-4ccde2d356e73430738380cb8b94575bdf707f9b.tar.gz | |
Merge commit 'b00444c0bbbc78ae477ec697d6569893609f420d' into release/1.1
* commit 'b00444c0bbbc78ae477ec697d6569893609f420d':
configure: Update freetype check to follow upstream
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions