From 3d6fac8cee1a5d4afb0b79894d83d076d4715e19 Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Tue, 10 Feb 2009 11:29:31 +0000
Subject: [PATCH] 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
---
configure | 2 +-
libavcodec/libopenjpeg.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 9ad386c4d2f..dc51fa592dd 100755
--- 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 f231ea3336b..70581ee73c1 100644
--- 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
--
GitLab