summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2010-04-30 18:56:14 (GMT)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2010-04-30 19:01:55 (GMT)
commit00f7fbe750be2da33bbd9f5d47d395eb46120881 (patch)
treef5867c25c93550fca9fb0e3a3bad71e7f29a7f23
parented71d802fc39e1a5f902ea3f56e42f9470a0b8aa (diff)
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
-rw-r--r--gst-libs/gst/rtsp/gstrtspbase64.c10
-rw-r--r--gst-libs/gst/rtsp/gstrtspbase64.h8
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__ */