summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMichael Bradshaw <mjbshaw@google.com>2015-11-01 19:11:12 -0800
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-25 10:55:34 +0100
commit99eabcdd5f904e98a02184889ab84cc9d5c17a8c (patch)
treeb2c7824ca28da8eeccaf367bf3e78816cb3a67c7 /configure
parent9cc1e644f39ed6a32e3a9bf5d0d6d663ca5791ab (diff)
avcodec: add OpenJPEG 2.x compatibility
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index ba7722186e..455449a71e 100755
--- a/configure
+++ b/configure
@@ -1777,6 +1777,8 @@ HEADERS_LIST="
machine_ioctl_bt848_h
machine_ioctl_meteor_h
malloc_h
+ openjpeg_2_1_openjpeg_h
+ openjpeg_2_0_openjpeg_h
openjpeg_1_5_openjpeg_h
OpenGL_gl3_h
poll_h
@@ -5434,7 +5436,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/cxcore.h cvCreateImageHeader
enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
-enabled libopenjpeg && { check_lib openjpeg.h opj_version -lopenmj2 -DOPJ_STATIC ||
+enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
+ check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -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"; }