diff options
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 826a16f..eeb3dd6 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 b87d4d4..13e8ef9 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; |
