diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2017-10-20 11:44:50 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2017-10-20 12:27:30 +0200 |
| commit | e5977b8794428ee1e37763738af5d880d9482fcd (patch) | |
| tree | 646c642560b1727edb0cdbf8823c8e88acd0da22 /ext/openjpeg/gstopenjpeg.h | |
| parent | bff2d834a4a38f64e555cee3d0144fde6c515acd (diff) | |
| download | gstreamer-plugins-bad-e5977b8794428ee1e37763738af5d880d9482fcd.tar.gz | |
openjpeg: Remove compatibility with openjpeg 2.0
Everyone seems to be shipping 2.1 as the oldest v2 version, even debian
oldstable (jessie).
Also remove an unneeded (debug?) #include <stdio.h>.
https://bugzilla.gnome.org/show_bug.cgi?id=788703
Diffstat (limited to 'ext/openjpeg/gstopenjpeg.h')
| -rw-r--r-- | ext/openjpeg/gstopenjpeg.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ext/openjpeg/gstopenjpeg.h b/ext/openjpeg/gstopenjpeg.h index f9ca74a2f..5985f8437 100644 --- a/ext/openjpeg/gstopenjpeg.h +++ b/ext/openjpeg/gstopenjpeg.h @@ -21,8 +21,9 @@ #ifndef __GST_OPENJPEG_H__ #define __GST_OPENJPEG_H__ -#ifdef HAVE_OPENJPEG_1 #include <openjpeg.h> + +#ifdef HAVE_OPENJPEG_1 #define OPJ_CLRSPC_UNKNOWN CLRSPC_UNKNOWN #define OPJ_CLRSPC_SRGB CLRSPC_SRGB #define OPJ_CLRSPC_GRAY CLRSPC_GRAY @@ -36,13 +37,6 @@ #define OPJ_RPCL RPCL #define OPJ_PCRL PCRL #define OPJ_CPRL CPRL -#else -#include <stdio.h> -# if defined(HAVE_OPENJPEG_2_1) -# include <openjpeg.h> -# else -# include <openjpeg-2.0/openjpeg.h> -# endif #endif #endif /* __GST_OPENJPEG_H__ */ |