[gst-cvs] gst-plugins-base: rtsp: deprecate remaining base64 function now that we depend on GLib 2.20

[Tim Müller]

Module: gst-plugins-base
Branch: master
Commit: 00f7fbe750be2da33bbd9f5d47d395eb46120881
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=00f7fbe750be2da33bbd9f5d47d395eb46120881

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Fri Apr 30 19:56:14 2010 +0100

rtsp: deprecate remaining base64 function now that we depend on GLib 2.20

API: deprecate gst_rtsp_base64_decode_ip(), use g_base64_decode_inplace() instead

---

 gst-libs/gst/rtsp/gstrtspbase64.c |   10 +++++++---
 gst-libs/gst/rtsp/gstrtspbase64.h |    8 +++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gst-libs/gst/rtsp/gstrtspbase64.c b/gst-libs/gst/rtsp/gstrtspbase64.c
index b96e2d7..a1064d6 100644
--- a/gst-libs/gst/rtsp/gstrtspbase64.c
+++ b/gst-libs/gst/rtsp/gstrtspbase64.c
@@ -63,10 +63,13 @@ gst_rtsp_base64_encode (const gchar * data, gsize len)
  *
  * Decode the base64 string pointed to by @data in-place. When @len is not #NULL
  * it will contain the length of the decoded data.
+ *
+ * Deprecated: use g_base64_decode_inplace() instead.
  */
-/* FIXME: Deprecate this once we depend on GLib 2.20 and
- * use g_base64_decode_inplace then.
- */
+#ifndef GST_REMOVE_DEPRECATED
+#ifdef GST_DISABLE_DEPRECATED
+void gst_rtsp_base64_decode_ip (gchar * data, gsize * len);
+#endif
 void
 gst_rtsp_base64_decode_ip (gchar * data, gsize * len)
 {
@@ -85,3 +88,4 @@ gst_rtsp_base64_decode_ip (gchar * data, gsize * len)
   if (len)
     *len = output_length;
 }
+#endif
diff --git a/gst-libs/gst/rtsp/gstrtspbase64.h b/gst-libs/gst/rtsp/gstrtspbase64.h
index a92e996..1501c10 100644
--- a/gst-libs/gst/rtsp/gstrtspbase64.h
+++ b/gst-libs/gst/rtsp/gstrtspbase64.h
@@ -17,8 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __BASE64_H__
-#define __BASE64_H__
+#ifndef __GST_RTSP_BASE64_H__
+#define __GST_RTSP_BASE64_H__
 
 #include <glib.h>
 
@@ -28,8 +28,10 @@ G_BEGIN_DECLS
 gchar *gst_rtsp_base64_encode    (const gchar *data, gsize len);
 #endif
 
+#ifndef GST_DISABLE_DEPRECATED
 void   gst_rtsp_base64_decode_ip (gchar *data, gsize *len);
+#endif
 
 G_END_DECLS
 
-#endif
+#endif /* __GST_RTSP_BASE64_H__ */