[FFmpeg-cvslog] configure: Simplify libopenjpeg check

Diego Biurrun git at videolan.org
Mon Mar 20 10:49:01 EET 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Apr 10 19:29:25 2015 +0200| [b8c2d407efa41c3db6813ad67fadd51b814765bd] | committer: Diego Biurrun

configure: Simplify libopenjpeg check

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8c2d407efa41c3db6813ad67fadd51b814765bd
---

 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 86aa017..3229153 100755
--- a/configure
+++ b/configure
@@ -4614,8 +4614,8 @@ enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec
 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 libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
-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 libopenjpeg       && { 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



More information about the ffmpeg-cvslog mailing list