Ticket #2016: openjpeg2.patch

ffmpeg-2.1.3

@@ -4294 +4294 @@
 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 ||
+enabled libopenjpeg       && { check_lib openjpeg-2.0/openmj2.h opj_version -lopenmj2 ||
+                               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

libavcodec/libopenjpegdec.c

@@ -37 +37 @@
 #if HAVE_OPENJPEG_1_5_OPENJPEG_H
 # include <openjpeg-1.5/openjpeg.h>
 #else
-# include <openjpeg.h>
+  #if HAVE_OPENJPEG_2_0_OPENJPEG_H
+    # include <openjpeg-2.0/openmj2.h>
+  #else     
+    # include <openjpeg.h>
+  #endif  
 #endif
 
 #define JP2_SIG_TYPE    0x6A502020

libavcodec/libopenjpegenc.c

@@ -37 +37 @@
 #if HAVE_OPENJPEG_1_5_OPENJPEG_H
 # include <openjpeg-1.5/openjpeg.h>
 #else
-# include <openjpeg.h>
+  #if HAVE_OPENJPEG_2_0_OPENJPEG_H
+    # include <openjpeg-2.0/openmj2.h>
+  #else     
+    # include <openjpeg.h>
+  #endif  
 #endif
 
 typedef struct {