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 /libavcodec | |
| 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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 7 | ||||
| -rw-r--r-- | libavcodec/libopenjpegenc.c | 7 |
2 files changed, 12 insertions, 2 deletions
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; |