diff options
| author | Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> | 2012-01-27 14:49:58 +0000 |
|---|---|---|
| committer | Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> | 2012-01-27 15:47:07 +0000 |
| commit | 8147669971151c33d12c645a242406e518291ff0 (patch) | |
| tree | 95fcad2d1c8066f768d85fcfdc8547e5660322d2 /gst/inter | |
| parent | f4d6e03b9b36e76d57745438178d3ddacddb9247 (diff) | |
| download | gstreamer-plugins-bad-8147669971151c33d12c645a242406e518291ff0.tar.gz | |
plenty: fixup glib deprecations
Diffstat (limited to 'gst/inter')
| -rw-r--r-- | gst/inter/Makefile.am | 4 | ||||
| -rw-r--r-- | gst/inter/gstintersurface.c | 1 | ||||
| -rw-r--r-- | gst/inter/gstintertest.c | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/gst/inter/Makefile.am b/gst/inter/Makefile.am index 7728de991..d6749a5ef 100644 --- a/gst/inter/Makefile.am +++ b/gst/inter/Makefile.am @@ -24,6 +24,7 @@ noinst_HEADERS = \ libgstinter_la_CFLAGS = \ $(GST_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_BASE_CFLAGS) libgstinter_la_LIBADD = \ @@ -40,7 +41,8 @@ gstintertest_SOURCES = \ gstintertest_CFLAGS = \ $(GST_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_PLUGINS_BAD_CFLAGS) gstintertest_LDADD = \ $(GST_LIBS) \ diff --git a/gst/inter/gstintersurface.c b/gst/inter/gstintersurface.c index 1d23e5de1..0fc1c84cc 100644 --- a/gst/inter/gstintersurface.c +++ b/gst/inter/gstintersurface.c @@ -23,6 +23,7 @@ #include <string.h> +#include <gst/glib-compat-private.h> #include "gstintersurface.h" static GList *list; diff --git a/gst/inter/gstintertest.c b/gst/inter/gstintertest.c index cb7b08c66..ff4c65f47 100644 --- a/gst/inter/gstintertest.c +++ b/gst/inter/gstintertest.c @@ -29,6 +29,7 @@ #endif #include <gst/gst.h> +#include <gst/glib-compat-private.h> #include <stdlib.h> //#define GETTEXT_PACKAGE "intertest" @@ -80,8 +81,10 @@ main (int argc, char *argv[]) GstInterTest *intertest2; GMainLoop *main_loop; +#if !GLIB_CHECK_VERSION (2, 31, 0) if (!g_thread_supported ()) g_thread_init (NULL); +#endif context = g_option_context_new ("- FIXME"); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); |