diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 00:57:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:01:32 +0200 |
| commit | 2f894deeda18bf9162d7ceb96fa83253e331a37e (patch) | |
| tree | ac30d1aaeb48cc86b92ae06a2e50cee514371826 | |
| parent | e771425e985efd140474c2bc93333da6de14edee (diff) | |
| parent | aedf1a2996e70d322220d2704d5a615c4f7b1b23 (diff) | |
| download | ffmpeg-2f894deeda18bf9162d7ceb96fa83253e331a37e.tar.gz | |
Merge commit 'aedf1a2996e70d322220d2704d5a615c4f7b1b23' into release/0.10
* commit 'aedf1a2996e70d322220d2704d5a615c4f7b1b23':
Update Changelog for 0.8.11
configure: Update freetype check to follow upstream
Conflicts:
Changelog
Changelog not merged as it does not match for FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3141,7 +3141,7 @@ enabled libdirac && require_pkg_config dirac \ "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \ "dirac_decoder_init dirac_encoder_init" enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac -enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType +enabled libfreetype && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame |