summaryrefslogtreecommitdiffstats
path: root/sys/v4l2
diff options
context:
space:
mode:
authorEdgard Lima <edgard.lima@indt.org.br>2006-04-13 21:45:57 +0000
committerEdgard Lima <edgard.lima@indt.org.br>2006-04-13 21:45:57 +0000
commit3091a399ebc5b2efad779d9cb82c2e4c9f013d26 (patch)
tree151b8dfc6e8eddad84238734ef880f5fc5fc8642 /sys/v4l2
parent86f9a0ed31021837b446812bf7778fb8a1835d5b (diff)
downloadgst-plugins-bad-3091a399ebc5b2efad779d9cb82c2e4c9f013d26.tar.gz
gst-plugins-bad-3091a399ebc5b2efad779d9cb82c2e4c9f013d26.tar.bz2
gst-plugins-bad-3091a399ebc5b2efad779d9cb82c2e4c9f013d26.zip
Fixed some memory leaks.
Original commit message from CVS: Fixed some memory leaks.
Diffstat (limited to 'sys/v4l2')
-rw-r--r--sys/v4l2/gstv4l2src.c19
-rw-r--r--sys/v4l2/v4l2src_calls.c10
2 files changed, 24 insertions, 5 deletions
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index e2182990..35a68bad 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -102,6 +102,7 @@ static guint32 gst_v4l2_formats[] = {
GST_BOILERPLATE (GstV4l2Src, gst_v4l2src, GstV4l2Element, GST_TYPE_V4L2ELEMENT);
+static void gst_v4l2src_dispose (GObject * object);
/* basesrc methods */
static gboolean gst_v4l2src_start (GstBaseSrc * src);
@@ -162,6 +163,9 @@ gst_v4l2src_class_init (GstV4l2SrcClass * klass)
basesrc_class->stop = gst_v4l2src_stop;
pushsrc_class->create = gst_v4l2src_create;
+
+ gobject_class->dispose = gst_v4l2src_dispose;
+
}
static void
@@ -183,6 +187,21 @@ gst_v4l2src_init (GstV4l2Src * v4l2src, GstV4l2SrcClass * klass)
gst_base_src_set_live (GST_BASE_SRC (v4l2src), TRUE);
}
+
+static void
+gst_v4l2src_dispose (GObject * object)
+{
+ GstV4l2Src *v4l2src = GST_V4L2SRC (object);
+
+ if (v4l2src->formats) {
+ gst_v4l2src_clear_format_list (v4l2src);
+ }
+
+ if (((GObjectClass *) parent_class)->dispose)
+ ((GObjectClass *) parent_class)->dispose (object);
+}
+
+
static void
gst_v4l2src_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec)
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c
index 19af162b..b1d9788f 100644
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@@ -789,15 +789,15 @@ gst_v4l2src_buffer_new (GstV4l2Src * v4l2src, guint size, guint8 * data,
fps_d = 1;
}
- buf = (GstBuffer *) gst_mini_object_new (GST_TYPE_V4L2SRC_BUFFER);
-
- GST_V4L2SRC_BUFFER (buf)->buf = srcbuf;
-
if (data == NULL) {
- GST_BUFFER_DATA (buf) = g_malloc (size);
+ buf = gst_buffer_new_and_alloc (size);
} else {
+ buf = (GstBuffer *) gst_mini_object_new (GST_TYPE_V4L2SRC_BUFFER);
GST_BUFFER_DATA (buf) = data;
+ GST_V4L2SRC_BUFFER (buf)->buf = srcbuf;
}
+
+
GST_BUFFER_SIZE (buf) = size;
GST_BUFFER_TIMESTAMP (buf) =