From db47065810bfe6611bbdf2c9a1a95b92f8df836b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 12 Feb 2008 11:36:27 +0000 Subject: [PATCH] sys/v4l/v4lsrc_calls.c: Correctly chain up the finalize method. Original commit message from CVS: * sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_buffer_class_init), (gst_v4lsrc_buffer_finalize): Correctly chain up the finalize method. --- ChangeLog | 6 ++++++ sys/v4l/v4lsrc_calls.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 08af99ce7b..f23c33c96b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-12 Sebastian Dröge + + * sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_buffer_class_init), + (gst_v4lsrc_buffer_finalize): + Correctly chain up the finalize method. + 2008-02-12 Sebastian Dröge * ext/gio/gstgiostreamsink.c: diff --git a/sys/v4l/v4lsrc_calls.c b/sys/v4l/v4lsrc_calls.c index 39e45174a0..a110c16150 100644 --- a/sys/v4l/v4lsrc_calls.c +++ b/sys/v4l/v4lsrc_calls.c @@ -632,6 +632,8 @@ static void gst_v4lsrc_buffer_class_init (gpointer g_class, static void gst_v4lsrc_buffer_init (GTypeInstance * instance, gpointer g_class); static void gst_v4lsrc_buffer_finalize (GstV4lSrcBuffer * v4lsrc_buffer); +static GstBufferClass *v4lbuffer_parent_class = NULL; + GType gst_v4lsrc_buffer_get_type (void) { @@ -661,6 +663,8 @@ gst_v4lsrc_buffer_class_init (gpointer g_class, gpointer class_data) { GstMiniObjectClass *mini_object_class = GST_MINI_OBJECT_CLASS (g_class); + v4lbuffer_parent_class = g_type_class_peek_parent (g_class); + mini_object_class->finalize = (GstMiniObjectFinalizeFunction) gst_v4lsrc_buffer_finalize; } @@ -689,6 +693,9 @@ gst_v4lsrc_buffer_finalize (GstV4lSrcBuffer * v4lsrc_buffer) } gst_object_unref (v4lsrc); + + GST_MINI_OBJECT_CLASS (v4lbuffer_parent_class)-> + finalize (GST_MINI_OBJECT (v4lsrc_buffer)); } /* Create a V4lSrc buffer from our mmap'd data area */