diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2014-03-12 09:30:07 +0000 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2014-03-14 21:28:23 -0400 |
commit | b920c1d5ad5cfe74c95b0eaec0e69b074ee9b4c1 (patch) | |
tree | 857dab4687156d17fb4f8869600ad5745cc1a9d4 | |
parent | 2b9ee7d5b901e0d7ba617511e4ed31d3043894d3 (diff) | |
download | ffmpeg-b920c1d5ad5cfe74c95b0eaec0e69b074ee9b4c1.tar.gz |
configure: Support older version of openjpeg1
It should work best for debian stable and people not installing the .pc
file.
(cherry picked from commit aa807425395caa17a85ed2833133278e8bd44a76)
-rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -3938,7 +3938,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 && require_pkg_config libopenjpeg1 openjpeg.h opj_version +enabled libopenjpeg && { { check_header openjpeg.h && check_lib2 openjpeg.h opj_version -lopenjpeg; } || + { require_pkg_config libopenjpeg1 openjpeg.h opj_version; } } 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 |