diff options
| author | Johannes Nixdorf <mixi@exherbo.org> | 2012-12-16 16:02:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-22 18:55:39 +0100 |
| commit | e749b5dd9873eb6fb31dde9041c81d5032574de2 (patch) | |
| tree | c32ad9bdeb33b7be24d53f11826a9832419e938f | |
| parent | 985aa0be828da073d765a8c1dbb38efad43891ed (diff) | |
| download | ffmpeg-e749b5dd9873eb6fb31dde9041c81d5032574de2.tar.gz | |
configure: consider using /usr/include/openjpeg-1.5 when searching for openjpeg
Beginning with version 1.5.1 openjpeg defaults to install its headers to
/usr/include/openjpeg-${major}.${minor} instead of /usr/include without
providing a compatibility symlink making the old test fail.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 7 | ||||
| -rw-r--r-- | libavcodec/libopenjpegenc.c | 7 |
3 files changed, 16 insertions, 3 deletions
@@ -1406,6 +1406,7 @@ HAVE_LIST=" mprotect msvcrt nanosleep + openjpeg_1_5_openjpeg_h PeekNamedPipe perl pod2man @@ -3843,7 +3844,9 @@ 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 && require libopenjpeg openjpeg.h opj_version -lopenjpeg +enabled libopenjpeg && { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg || + check_lib openjpeg.h opj_version -lopenjpeg || + die "ERROR: libopenjpeg not found"; } enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 826a16fb84..eeb3dd63f6 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -25,7 +25,6 @@ */ #define OPJ_STATIC -#include <openjpeg.h> #include "libavutil/common.h" #include "libavutil/intreadwrite.h" @@ -35,6 +34,12 @@ #include "avcodec.h" #include "thread.h" +#if HAVE_OPENJPEG_1_5_OPENJPEG_H +# include <openjpeg-1.5/openjpeg.h> +#else +# include <openjpeg.h> +#endif + #define JP2_SIG_TYPE 0x6A502020 #define JP2_SIG_VALUE 0x0D0A870A diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index b87d4d40f8..13e8ef914c 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -25,7 +25,6 @@ */ #define OPJ_STATIC -#include <openjpeg.h> #include "libavutil/avassert.h" #include "libavutil/common.h" @@ -35,6 +34,12 @@ #include "avcodec.h" #include "internal.h" +#if HAVE_OPENJPEG_1_5_OPENJPEG_H +# include <openjpeg-1.5/openjpeg.h> +#else +# include <openjpeg.h> +#endif + typedef struct { AVClass *avclass; opj_image_t *image; |