diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-03-12 09:30:07 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-04-21 07:33:14 +0200 |
| commit | ce364088ef53dbaf90e74a471d12b732b697e0cd (patch) | |
| tree | c84a7bc31942c50b67615901c34589904d71a996 | |
| parent | ca14a2d0e40720d018421e06995737e5682c33c9 (diff) | |
| download | ffmpeg-ce364088ef53dbaf90e74a471d12b732b697e0cd.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)
Conflicts:
configure
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -3499,7 +3499,8 @@ enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_q 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 |