diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-03-22 20:16:44 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2014-03-23 01:14:31 +0100 |
| commit | 0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1 (patch) | |
| tree | ce1d4fcd2643eedec485bf85fa1a48985f3df036 | |
| parent | 1e9db41e2a2166be5671b088ef4ad06a40af459f (diff) | |
| download | ffmpeg-0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1.tar.gz | |
configure: Always use -DOPJ_STATIC when checking for openjpeg
Unbreaks windows systems not providing pkgconf files.
Reported-By: Rafaël Carré <funman@videolan.org>
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4022,8 +4022,8 @@ enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb enabled libopencv && require_pkg_config opencv opencv/cv.h cvCreateImageHeader -enabled libopenjpeg && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg; } || - { require_pkg_config libopenjpeg1 openjpeg.h opj_version; } } +enabled libopenjpeg && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC; } || + { require_pkg_config libopenjpeg1 openjpeg.h opj_version -DOPJ_STATIC; } } enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket |