[FFmpeg-cvslog] r17129 - in trunk: configure libavcodec/libopenjpeg.c

[diego]

Author: diego
Date: Tue Feb 10 12:29:31 2009
New Revision: 17129

Log:
Use default system include path for an installed OpenJPEG library.
patch by Mathieu Malaterre, mathieu.malaterre gmail com

Modified:
   trunk/configure
   trunk/libavcodec/libopenjpeg.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Feb 10 11:35:05 2009	(r17128)
+++ trunk/configure	Tue Feb 10 12:29:31 2009	(r17129)
@@ -1931,7 +1931,7 @@ enabled libfaad    && require2 libfaad f
 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

Modified: trunk/libavcodec/libopenjpeg.c
==============================================================================
--- trunk/libavcodec/libopenjpeg.c	Tue Feb 10 11:35:05 2009	(r17128)
+++ trunk/libavcodec/libopenjpeg.c	Tue Feb 10 12:29:31 2009	(r17129)
@@ -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