diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-09-25 22:35:39 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-09-26 00:06:41 +0200 |
| commit | 475e3799cdcc90a38f9bbc4c6b9159a028b1ad44 (patch) | |
| tree | 28ded971b0c72350fa279b949b9e1dc8e6af7eba | |
| parent | 8de7bdd756b6a14d92dc48c34d3190d6a806934a (diff) | |
| download | ffmpeg-475e3799cdcc90a38f9bbc4c6b9159a028b1ad44.tar.gz | |
Support libopenjpeg 2.x via libopenmj2.
Based on a patch by Marius Cirsta.
Fixes ticket #2016.
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |