diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-02 19:14:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-02 19:31:22 +0200 |
| commit | 2a339720309352cd685237dd809d1ad2bb1369f1 (patch) | |
| tree | aacd7b36fd345d955454598d282f5c9fe98a644c /configure | |
| parent | f939bf58b22896fadfcfadaddb9c222a86e7ecfa (diff) | |
| parent | fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d (diff) | |
| download | ffmpeg-2a339720309352cd685237dd809d1ad2bb1369f1.tar.gz | |
Merge commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d'
* commit 'fd11465b21ac90bf6964b0c0ca9d6ba64cd3291d':
configure: Use pkg-config for fdk-aac
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -5110,7 +5110,9 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && enabled libcaca && require_pkg_config caca caca.h caca_create_canvas enabled libdcadec && require_pkg_config dcadec libdcadec/dca_context.h dcadec_context_create enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac -enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac +enabled libfdk_aac && { use_pkg_config fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || + { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && + warn "using libfdk without pkg-config"; } } flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs enabled fontconfig && enable libfontconfig |