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
pull/126/head
Mathieu Malaterre 16 years ago committed by Diego Biurrun
parent 79ff462e73
commit 3d6fac8cee
  1. 2
      configure
  2. 2
      libavcodec/libopenjpeg.c

2
configure vendored

@ -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

Loading…
Cancel
Save