From 9ab5f79784c47f940b824d552a8df26405037276 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 13 Jul 2011 14:35:51 +0200 Subject: [PATCH] build: Only require GStreamer >= 0.10.29 and GLib >= 2.16 --- configure.ac | 5 +++-- omx/gstomx.c | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index fd30dba..7faff82 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL dnl *** required versions of GStreamer stuff *** -GST_REQ=0.10.34 +GST_REQ=0.10.29 dnl *** autotools stuff **** @@ -141,7 +141,7 @@ AG_GST_CHECK_FUNCTION dnl *** checks for dependency libraries *** dnl GLib is required -AG_GST_GLIB_CHECK([2.24]) +AG_GST_GLIB_CHECK([2.16]) dnl checks for gstreamer dnl uninstalled is selected preferentially -- see pkg-config(1) @@ -149,6 +149,7 @@ AG_GST_CHECK_GST($GST_MAJORMINOR, [$GST_REQ], yes) AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], yes) AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ], yes) AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no) +AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GST_REQ], yes) AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") dnl Check for documentation xrefs diff --git a/omx/gstomx.c b/omx/gstomx.c index 0581d37..f6f02e8 100644 --- a/omx/gstomx.c +++ b/omx/gstomx.c @@ -380,7 +380,11 @@ gst_omx_component_free (GstOMXComponent * comp) g_slice_free (GstOMXPort, port); } +#if GLIB_CHECK_VERSION(2,22,0) g_ptr_array_unref (comp->ports); +#else + g_ptr_array_free (comp->ports, TRUE); +#endif } g_cond_free (comp->state_cond); @@ -1189,7 +1193,11 @@ gst_omx_port_deallocate_buffers_unlocked (GstOMXPort * port) } g_queue_clear (port->pending_buffers); +#if GLIB_CHECK_VERSION(2,22,0) g_ptr_array_unref (port->buffers); +#else + g_ptr_array_free (port->buffers, TRUE); +#endif port->buffers = NULL; done: -- 2.7.4