From ace51b689fa5c35bf4c4e2f44c8c54677fc36df5 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 10 Nov 2011 17:39:10 +0100 Subject: [PATCH] rtsp: remove deprecated base64 library --- gst-libs/gst/rtsp/Makefile.am | 6 +-- gst-libs/gst/rtsp/gstrtspbase64.c | 91 ----------------------------------- gst-libs/gst/rtsp/gstrtspbase64.h | 37 -------------- gst-libs/gst/rtsp/gstrtspconnection.c | 1 - 4 files changed, 2 insertions(+), 133 deletions(-) delete mode 100644 gst-libs/gst/rtsp/gstrtspbase64.c delete mode 100644 gst-libs/gst/rtsp/gstrtspbase64.h diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am index 74adf9e..5fb5fe1 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am @@ -1,7 +1,6 @@ libgstrtspincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/rtsp -libgstrtspinclude_HEADERS = gstrtspbase64.h \ - gstrtsptransport.h \ +libgstrtspinclude_HEADERS = gstrtsptransport.h \ gstrtspurl.h \ gstrtspmessage.h \ gstrtspconnection.h \ @@ -17,8 +16,7 @@ lib_LTLIBRARIES = libgstrtsp-@GST_MAJORMINOR@.la built_sources = gstrtsp-marshal.c gstrtsp-enumtypes.c built_headers = gstrtsp-marshal.h gstrtsp-enumtypes.h -libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = gstrtspbase64.c \ - gstrtsptransport.c \ +libgstrtsp_@GST_MAJORMINOR@_la_SOURCES = gstrtsptransport.c \ gstrtspurl.c \ gstrtspmessage.c \ gstrtspconnection.c \ diff --git a/gst-libs/gst/rtsp/gstrtspbase64.c b/gst-libs/gst/rtsp/gstrtspbase64.c deleted file mode 100644 index a1064d6..0000000 --- a/gst-libs/gst/rtsp/gstrtspbase64.c +++ /dev/null @@ -1,91 +0,0 @@ -/* GStreamer - * Copyright (C) <2007> Mike Smith - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/** - * SECTION:gstrtspbase64 - * @short_description: Helper functions to handle Base64 - * - * Last reviewed on 2007-07-24 (0.10.14) - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include - -#include "gstrtspbase64.h" - -/** - * gst_rtsp_base64_encode: - * @data: the binary data to encode - * @len: the length of @data - * - * Encode a sequence of binary data into its Base-64 stringified representation. - * - * Deprecated: Use g_base64_encode() - * - * Returns: a newly allocated, zero-terminated Base-64 encoded string - * representing @data. - */ -/* This isn't efficient, but it doesn't need to be */ -#ifndef GST_REMOVE_DEPRECATED -#ifdef GST_DISABLE_DEPRECATED -gchar *gst_rtsp_base64_encode (const gchar * data, gsize len); -#endif -gchar * -gst_rtsp_base64_encode (const gchar * data, gsize len) -{ - return g_base64_encode ((const guchar *) data, len); -} -#endif - -/** - * gst_rtsp_base64_decode_ip: - * @data: the base64 encoded data - * @len: location for output length or NULL - * - * 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. - */ -#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) -{ - gint input_length, output_length, state = 0; - guint save = 0; - - g_return_if_fail (data != NULL); - - input_length = strlen (data); - - g_return_if_fail (input_length > 1); - - output_length = - g_base64_decode_step (data, input_length, (guchar *) data, &state, &save); - - if (len) - *len = output_length; -} -#endif diff --git a/gst-libs/gst/rtsp/gstrtspbase64.h b/gst-libs/gst/rtsp/gstrtspbase64.h deleted file mode 100644 index 1501c10..0000000 --- a/gst-libs/gst/rtsp/gstrtspbase64.h +++ /dev/null @@ -1,37 +0,0 @@ -/* GStreamer - * Copyright (C) <2007> Mike Smith - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GST_RTSP_BASE64_H__ -#define __GST_RTSP_BASE64_H__ - -#include - -G_BEGIN_DECLS - -#ifndef GST_DISABLE_DEPRECATED -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 /* __GST_RTSP_BASE64_H__ */ diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c index 2de21b9..f481edd 100644 --- a/gst-libs/gst/rtsp/gstrtspconnection.c +++ b/gst-libs/gst/rtsp/gstrtspconnection.c @@ -91,7 +91,6 @@ #endif #include "gstrtspconnection.h" -#include "gstrtspbase64.h" union gst_sockaddr { -- 2.7.4