diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-10-11 20:28:35 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-10-13 21:04:19 +0200 |
| commit | 7a65aef00d113a38e0d1a54df49eead9df6aa15c (patch) | |
| tree | f0bcc427e08f97c3c02454d83f2e82b4e4d149a0 /libavcodec/libopenjpegenc.c | |
| parent | c593a70cda5673ed3a04c909ddc00e1147f53622 (diff) | |
| download | ffmpeg-7a65aef00d113a38e0d1a54df49eead9df6aa15c.tar.gz | |
configure: fix detection of libopenjpeg
Use check_lib2 to test the header together with the function. This is
necessary, because '-DOPJ_STATIC' changes what the included header does.
Also add '-DOPJ_STATIC' to CPPFLAGS, so that it isn't necessary to
hardcode this in libavcodec/libopenjpeg{dec,enc}.c.
Finally, check for non-static openjpeg 2.1, too.
Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec/libopenjpegenc.c')
| -rw-r--r-- | libavcodec/libopenjpegenc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index 14435515bc..5042507ea4 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -24,8 +24,6 @@ * JPEG 2000 encoder using libopenjpeg */ -#define OPJ_STATIC - #include "libavutil/avassert.h" #include "libavutil/common.h" #include "libavutil/imgutils.h" |