Use default system include path for an installed OpenJPEG library.

patch by Mathieu Malaterre, mathieu.malaterre gmail com

Originally committed as revision 17129 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 9ad386c4d2f5d473e9351905f49f1ac28950f2e7..dc51fa592dda13eba04b1c9cd8a74a1ff4f56a51 100755 (executable)
--- a/configure
+++ b/configure
@@ -1931,7 +1931,7 @@ enabled libfaad    && require2 libfaad faad.h faacDecOpen -lfaad
 enabled libgsm     && require  libgsm gsm.h gsm_create -lgsm
 enabled libmp3lame && require  libmp3lame lame/lame.h lame_init -lmp3lame -lm
 enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut
-enabled libopenjpeg && require libopenjpeg libopenjpeg/openjpeg.h opj_version -lopenjpeg
+enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
 enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) &&
                            require libschroedinger schroedinger/schro.h schro_init $(pkg-config --libs schroedinger-1.0)
 enabled libspeex   && require  libspeex speex/speex.h speex_decoder_init -lspeex

diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpeg.c
index f231ea3336b783490c083e6e57c9467eeded2ccf..70581ee73c1aa68cbbb0372771d792fbaf76ed0d 100644 (file)
--- a/libavcodec/libopenjpeg.c
+++ b/libavcodec/libopenjpeg.c
@@ -27,7 +27,7 @@
 #include "avcodec.h"
 #include "libavutil/intreadwrite.h"
 #define  OPJ_STATIC
-#include <libopenjpeg/openjpeg.h>
+#include <openjpeg.h>
 
 #define JP2_SIG_TYPE    0x6A502020
 #define JP2_SIG_VALUE   0x0D0A870A