summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gst/pcapparse/gstpcapparse.c15
2 files changed, 8 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a83ba46..3cad4548 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-26 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ * gst/pcapparse/gstpcapparse.c: (gst_pcap_parse_class_init):
+ Remove unused code and fix includes.
+
2008-08-25 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/deinterlace2/gstdeinterlace2.c:
diff --git a/gst/pcapparse/gstpcapparse.c b/gst/pcapparse/gstpcapparse.c
index f2674ea6..4be76605 100644
--- a/gst/pcapparse/gstpcapparse.c
+++ b/gst/pcapparse/gstpcapparse.c
@@ -40,15 +40,16 @@
* - Implement support for timestamping the buffers.
*/
-#include "gstpcapparse.h"
-
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include "gstpcapparse.h"
+
#ifndef _MSC_VER
#include <arpa/inet.h>
#include <netinet/in.h>
+#include <string.h>
#else
#include <winsock2.h>
#endif
@@ -76,7 +77,6 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS_ANY);
static void gst_pcap_parse_dispose (GObject * object);
-static void gst_pcap_parse_finalize (GObject * object);
static void gst_pcap_parse_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
static void gst_pcap_parse_set_property (GObject * object, guint prop_id,
@@ -113,7 +113,6 @@ gst_pcap_parse_class_init (GstPcapParseClass * klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->dispose = gst_pcap_parse_dispose;
- gobject_class->finalize = gst_pcap_parse_finalize;
gobject_class->get_property = gst_pcap_parse_get_property;
gobject_class->set_property = gst_pcap_parse_set_property;
@@ -171,14 +170,6 @@ gst_pcap_parse_dispose (GObject * object)
G_OBJECT_CLASS (parent_class)->dispose (object);
}
-static void
-gst_pcap_parse_finalize (GObject * object)
-{
- GstPcapParse *self = GST_PCAP_PARSE (object);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
static const gchar *
get_ip_address_as_string (gint64 ip_addr)
{