[FFmpeg-cvslog] Support libopenjpeg 2.x via libopenmj2.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Sep 25 22:35:39 2014 +0200| [475e3799cdcc90a38f9bbc4c6b9159a028b1ad44] | committer: Carl Eugen Hoyos

Support libopenjpeg 2.x via libopenmj2.

Based on a patch by Marius Cirsta.

Fixes ticket #2016.

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

 configure |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 53a1e38..28c735e 100755
--- 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