Commit 3d6fac8c authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Diego Biurrun
Browse files

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
parent 79ff462e
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment