diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-05-10 16:24:08 +0530 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2016-05-11 09:45:17 +0300 |
| commit | f2c4cb1970897a9e3ee161b7b7c990777107b61a (patch) | |
| tree | b18a39b60920338d9fd2e9604c89b3147d9254e4 /ext | |
| parent | dd1529e3f3fac2a3a11e38f85ca577f114dae163 (diff) | |
| download | gstreamer-plugins-bad-f2c4cb1970897a9e3ee161b7b7c990777107b61a.tar.gz | |
openjpeg: Port to 2.1 and require a pkg-config file for 2.0 and 2.1
The port was trivial, and according to the NEWS file nothing else has changed,
but it is possible that other API was changed without proper notification.
OpenJPEG upstream has shipped a pkg-config file for the past 4 years, and all
distros should be shipping it by now.
https://bugzilla.gnome.org/show_bug.cgi?id=766213
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openjpeg/gstopenjpeg.h | 6 | ||||
| -rw-r--r-- | ext/openjpeg/gstopenjpegdec.c | 4 | ||||
| -rw-r--r-- | ext/openjpeg/gstopenjpegenc.c | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/ext/openjpeg/gstopenjpeg.h b/ext/openjpeg/gstopenjpeg.h index ac28ccea9..03ce52e47 100644 --- a/ext/openjpeg/gstopenjpeg.h +++ b/ext/openjpeg/gstopenjpeg.h @@ -38,7 +38,11 @@ #define OPJ_CPRL CPRL #else #include <stdio.h> -#include <openjpeg-2.0/openjpeg.h> +# ifdef HAVE_OPENJPEG_2_1 +# include <openjpeg-2.1/openjpeg.h> +# else +# include <openjpeg-2.0/openjpeg.h> +# endif #endif #endif /* __GST_OPENJPEG_H__ */ diff --git a/ext/openjpeg/gstopenjpegdec.c b/ext/openjpeg/gstopenjpegdec.c index 112b3abab..5c6a2287a 100644 --- a/ext/openjpeg/gstopenjpegdec.c +++ b/ext/openjpeg/gstopenjpegdec.c @@ -1039,7 +1039,11 @@ gst_openjpeg_dec_handle_frame (GstVideoDecoder * decoder, opj_stream_set_write_function (stream, write_fn); opj_stream_set_skip_function (stream, skip_fn); opj_stream_set_seek_function (stream, seek_fn); +#ifdef HAVE_OPENJPEG_2_1 + opj_stream_set_user_data (stream, &mstream, NULL); +#else opj_stream_set_user_data (stream, &mstream); +#endif opj_stream_set_user_data_length (stream, mstream.size); image = NULL; diff --git a/ext/openjpeg/gstopenjpegenc.c b/ext/openjpeg/gstopenjpegenc.c index 7ccbf119d..0cc75b884 100644 --- a/ext/openjpeg/gstopenjpegenc.c +++ b/ext/openjpeg/gstopenjpegenc.c @@ -901,7 +901,11 @@ gst_openjpeg_enc_handle_frame (GstVideoEncoder * encoder, opj_stream_set_write_function (stream, write_fn); opj_stream_set_skip_function (stream, skip_fn); opj_stream_set_seek_function (stream, seek_fn); +#ifdef HAVE_OPENJPEG_2_1 + opj_stream_set_user_data (stream, &mstream, NULL); +#else opj_stream_set_user_data (stream, &mstream); +#endif opj_stream_set_user_data_length (stream, mstream.size); if (!opj_start_compress (enc, image, stream)) |