diff --git a/configure.ac b/configure.ac index a54af0f09d..7bef688161 100644 --- a/configure.ac +++ b/configure.ac @@ -2870,11 +2870,6 @@ AG_GST_CHECK_FEATURE(OPENJPEG, [openjpeg library], openjpeg, [ AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_1, libopenjp2 >= 2.1) if test x"$HAVE_OPENJPEG_2_1" = x"yes"; then AC_DEFINE([HAVE_OPENJPEG_2_1], 1, [Define if OpenJPEG 2.1 is used]) - dnl include paths changed for v2.2 - AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_2, libopenjp2 >= 2.2) - if test x"$HAVE_OPENJPEG_2_2" = x"yes"; then - AC_DEFINE([HAVE_OPENJPEG_2_2], 1, [Define if OpenJPEG 2.2 is used]) - fi fi else # Fallback to v1.5 diff --git a/ext/openjpeg/gstopenjpeg.h b/ext/openjpeg/gstopenjpeg.h index 52410a4f7a..f9ca74a2f7 100644 --- a/ext/openjpeg/gstopenjpeg.h +++ b/ext/openjpeg/gstopenjpeg.h @@ -38,10 +38,8 @@ #define OPJ_CPRL CPRL #else #include -# if defined(HAVE_OPENJPEG_2_2) -# include -# elif defined(HAVE_OPENJPEG_2_1) -# include +# if defined(HAVE_OPENJPEG_2_1) +# include # else # include # endif diff --git a/ext/openjpeg/meson.build b/ext/openjpeg/meson.build index 0d97ebb9ee..14b858317d 100644 --- a/ext/openjpeg/meson.build +++ b/ext/openjpeg/meson.build @@ -6,21 +6,15 @@ openjpeg_sources = [ openjpeg_cargs = [] -# Check for 2.2, 2.1, then 2.0 -openjpeg_dep = dependency('libopenjp2', version : '>=2.2', required : false) +# Check for 2.1, then 2.0, then 1.5 +openjpeg_dep = dependency('libopenjp2', version : '>=2.1', required : false) if openjpeg_dep.found() - openjpeg_cargs += ['-DHAVE_OPENJPEG_2_2', '-DHAVE_OPENJPEG_2_1'] + openjpeg_cargs += ['-DHAVE_OPENJPEG_2_1'] else - openjpeg_dep = dependency('libopenjp2', version : '>=2.1', required : false) - if openjpeg_dep.found() - openjpeg_cargs += ['-DHAVE_OPENJPEG_2_1'] - else - openjpeg_dep = dependency('libopenjp2', required : false) - # Fallback to 1.5 - if not openjpeg_dep.found() - openjpeg_dep = dependency('libopenjpeg1', required : false) - openjpeg_cargs += ['-DHAVE_OPENJPEG_1'] - endif + openjpeg_dep = dependency('libopenjp2', required : false) + if not openjpeg_dep.found() + openjpeg_dep = dependency('libopenjpeg1', required : false) + openjpeg_cargs += ['-DHAVE_OPENJPEG_1'] endif endif