[FFmpeg-devel] [PATCH]Allow using libopenjpeg 2.x

[Carl Eugen Hoyos]

On Wednesday 17 September 2014 09:16:06 am Reimar Döffinger wrote:
> On 16.09.2014, at 22:35, Carl Eugen Hoyos <cehoyos at ag.or.at> wrote:
> > Attached patch allows using libopenjpeg 2.x (tested with 2.1) here.
>
> Doesn't it make sense to prefer the newest version, i.e. we should check
> for this first and not last?

New patch attached.

Please comment, Carl Eugen
-------------- next part --------------
diff --git a/configure b/configure
index 12b2da5..6e1cee7 100755
--- a/configure
+++ b/configure
@@ -4826,7 +4826,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