Merge commit '8729698d50739524665090e083d1bfdf28235724'

[ffmpeg] / libavcodec / libopenjpegenc.c

diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index b87d4d40f8338ac4dc57351fa0a5db84d9be80f3..13e8ef914cdd75f615e14df5098a154039441936 100644 (file)
--- 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;