diff options
| author | Michael Bradshaw <mjbshaw@google.com> | 2017-10-05 01:37:11 +0300 |
|---|---|---|
| committer | Michael Bradshaw <mjbshaw@google.com> | 2017-10-08 18:13:02 +0300 |
| commit | 41d6d627024393c142cf7cd93eff1d5a049105f5 (patch) | |
| tree | 884c2b9d12f12e5d79a95d48efb017df177d2d88 /libavcodec/libopenjpegdec.c | |
| parent | d96d65dfebdd9f1396d51817c1716f86e536245c (diff) | |
lavc: add support for OpenJPEG 2.3.0
Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
Diffstat (limited to 'libavcodec/libopenjpegdec.c')
| -rw-r--r-- | libavcodec/libopenjpegdec.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 1210123265..67d47bd6a0 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -34,7 +34,9 @@ #include "internal.h" #include "thread.h" -#if HAVE_OPENJPEG_2_2_OPENJPEG_H +#if HAVE_OPENJPEG_2_3_OPENJPEG_H +# include <openjpeg-2.3/openjpeg.h> +#elif HAVE_OPENJPEG_2_2_OPENJPEG_H # include <openjpeg-2.2/openjpeg.h> #elif HAVE_OPENJPEG_2_1_OPENJPEG_H # include <openjpeg-2.1/openjpeg.h> @@ -46,7 +48,7 @@ # include <openjpeg.h> #endif -#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H +#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H # define OPENJPEG_MAJOR_VERSION 2 # define OPJ(x) OPJ_##x #else @@ -431,7 +433,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, opj_stream_set_read_function(stream, stream_read); opj_stream_set_skip_function(stream, stream_skip); opj_stream_set_seek_function(stream, stream_seek); -#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H +#if HAVE_OPENJPEG_2_3_OPENJPEG_H || HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H opj_stream_set_user_data(stream, &reader, NULL); #elif HAVE_OPENJPEG_2_0_OPENJPEG_H opj_stream_set_user_data(stream, &reader); |