From 9e03fd9fc07b9f2adf2cc07f72a30eafb36d5702 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 5 Jul 2005 10:20:14 +0000 Subject: [PATCH] gdp: Ported dataprotol to 0.9. Original commit message from CVS: * configure.ac: * libs/gst/dataprotocol/Makefile.am: * libs/gst/dataprotocol/dataprotocol.c: (gst_dp_validate_packet): * libs/gst/dataprotocol/dataprotocol.h: * pkgconfig/Makefile.am: * pkgconfig/gstreamer-dataprotocol-uninstalled.pc.in: * pkgconfig/gstreamer-dataprotocol.pc.in: Ported dataprotol to 0.9. Added pkgconfig files. --- gst/gdp/dataprotocol.c | 19 ++----------------- gst/gdp/dataprotocol.h | 4 ++-- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/gst/gdp/dataprotocol.c b/gst/gdp/dataprotocol.c index dabcb20..d83e649 100644 --- a/gst/gdp/dataprotocol.c +++ b/gst/gdp/dataprotocol.c @@ -103,8 +103,8 @@ gst_dp_dump_byte_array (guint8 * array, guint length) * * Initialize GStreamer Data Protocol library. * - * Should be called before using these functions; either from source linking - * to this source file or from plugin_init. + * Should be called before using these functions from source linking + * to this source file. */ void gst_dp_init (void) @@ -586,18 +586,3 @@ gst_dp_validate_packet (guint header_length, const guint8 * header, return TRUE; } - -/*** PLUGIN STUFF ***/ -static gboolean -plugin_init (GstPlugin * plugin) -{ - gst_dp_init (); - - return TRUE; -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "gstdataprotocol", - "a data protocol to serialize buffers, caps and events", - plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN) diff --git a/gst/gdp/dataprotocol.h b/gst/gdp/dataprotocol.h index da3c2b9..cb1c826 100644 --- a/gst/gdp/dataprotocol.h +++ b/gst/gdp/dataprotocol.h @@ -20,7 +20,6 @@ * Boston, MA 02111-1307, USA. */ -#ifdef GST_ENABLE_NEW #ifndef __GST_DATA_PROTOCOL_H__ #define __GST_DATA_PROTOCOL_H__ @@ -53,6 +52,8 @@ typedef enum { GST_DP_PAYLOAD_EVENT_NONE = 64, } GstDPPayloadType; +void gst_dp_init (void); + /* payload information from header */ guint32 gst_dp_header_payload_length (const guint8 * header); GstDPPayloadType @@ -98,5 +99,4 @@ gboolean gst_dp_validate_packet (guint header_length, G_END_DECLS #endif /* __GST_DATA_PROTOCOL_H__ */ -#endif /* GST_ENABLE_NEW */ -- 2.7.4