Support libopenjpeg 2.x via libopenmj2.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Thu, 25 Sep 2014 20:35:39 +0000 (22:35 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Thu, 25 Sep 2014 22:06:41 +0000 (00:06 +0200)
Based on a patch by Marius Cirsta.

Fixes ticket #2016.

configure

index 53a1e38..28c735e 100755 (executable)
--- a/configure
+++ b/configure
@@ -4837,7 +4837,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 -DOPJ_STATIC ||
+enabled libopenjpeg       && { check_lib openjpeg.h opj_version -lopenmj2 -DOPJ_STATIC ||
+                               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