[gst-cvs] gst-plugins-ugly: configure: Update required GLib version to 2.20

Sebastian Dröge slomo at kemper.freedesktop.org
Mon Jun 14 07:59:44 PDT 2010


Module: gst-plugins-ugly
Branch: master
Commit: 602fb1319a1069aa66bc37ec153f397a1f094186
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=602fb1319a1069aa66bc37ec153f397a1f094186

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Jun 14 16:59:25 2010 +0200

configure: Update required GLib version to 2.20

---

 configure.ac             |    2 +-
 gst/realmedia/rtspreal.c |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 93d74f8..8338ae9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,7 +151,7 @@ AG_GST_CHECK_FUNCTION
 dnl *** checks for dependency libraries ***
 
 dnl GLib is required
-AG_GST_GLIB_CHECK([2.18])
+AG_GST_GLIB_CHECK([2.20])
 ORC_CHECK([0.4.5])
 
 dnl checks for gstreamer
diff --git a/gst/realmedia/rtspreal.c b/gst/realmedia/rtspreal.c
index c3cfb47..b08a9db 100644
--- a/gst/realmedia/rtspreal.c
+++ b/gst/realmedia/rtspreal.c
@@ -205,11 +205,6 @@ G_STMT_START {			       \
   }                                    \
 } G_STMT_END
 
-/* FIXME: remove once we depend on GLib >= 2.20 */
-#if GLIB_CHECK_VERSION (2, 20, 0)
-#define gst_rtsp_base64_decode_ip g_base64_decode_inplace
-#endif
-
 #define READ_BUFFER_GEN(src, func, name, dest, dest_len)    \
 G_STMT_START {			                            \
   dest = (gchar *)func (src, name);                         \
@@ -221,7 +216,7 @@ G_STMT_START {			                            \
     dest += 8;                                              \
     dest_len = strlen (dest) - 1;                           \
     dest[dest_len] = '\0';                                  \
-    gst_rtsp_base64_decode_ip (dest, &dest_len);            \
+    g_base64_decode_inplace (dest, &dest_len);            \
   }                                                         \
 } G_STMT_END
 





More information about the Gstreamer-commits mailing list