diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:32:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:32:00 +0100 |
| commit | 1abb03195930163ba2c5850599c1380bd8b09c58 (patch) | |
| tree | d3139f76107972de60b78215fc0c8e643f39d877 | |
| parent | 802e5fc8f811fb0e1f23d3e12841d3134d67202e (diff) | |
| parent | 0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1 (diff) | |
| download | ffmpeg-1abb03195930163ba2c5850599c1380bd8b09c58.tar.gz | |
Merge commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1'
* commit '0f0d1d056e1a3ad3db32b7d1a06286b2841e91b1':
configure: Always use -DOPJ_STATIC when checking for openjpeg
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4570,8 +4570,8 @@ enabled libnut && require libnut libnut.h nut_demuxer_init -lnut 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/cxcore.h cvCreateImageHeader -enabled libopenjpeg && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg || - check_lib openjpeg.h opj_version -lopenjpeg || +enabled libopenjpeg && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || + check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC || die "ERROR: libopenjpeg not found"; } 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 |