diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-04-30 14:07:59 +0100 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-04-30 14:08:50 +0100 |
commit | 63931dc80b2b921171ff423f9a54b72adea80104 (patch) | |
tree | eaf9f915d43f17fc4a62de7ece9d785b5253da9b | |
parent | db4ccd86101e408bec622d7c7558b56876e9bb49 (diff) |
Bump GLib requirement to 2.20
See http://gstreamer.freedesktop.org/wiki/ReleasePlanning/GLibRequirement
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | ext/gio/gstgiobasesrc.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 3a1ad17a7..ff803b189 100644 --- a/configure.ac +++ b/configure.ac @@ -254,7 +254,7 @@ AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) dnl *** checks for dependency libraries *** dnl GLib is required -AG_GST_GLIB_CHECK([2.18]) +AG_GST_GLIB_CHECK([2.20]) dnl liboil is required PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.14, HAVE_LIBOIL=yes, HAVE_LIBOIL=no) diff --git a/ext/gio/gstgiobasesrc.c b/ext/gio/gstgiobasesrc.c index 85d94a07b..133e12c26 100644 --- a/ext/gio/gstgiobasesrc.c +++ b/ext/gio/gstgiobasesrc.c @@ -189,9 +189,8 @@ gst_gio_base_src_get_size (GstBaseSrc * base_src, guint64 * size) GFileInfo *info; GError *err = NULL; - /* FIXME: remove (char *) cast once we depend on GLib >= 2.20 */ info = g_file_input_stream_query_info (G_FILE_INPUT_STREAM (src->stream), - (char *) G_FILE_ATTRIBUTE_STANDARD_SIZE, src->cancel, &err); + G_FILE_ATTRIBUTE_STANDARD_SIZE, src->cancel, &err); if (info != NULL) { *size = g_file_info_get_size (info); |