From 502660a78485e9cfcc53629e66da446f48b0a829 Mon Sep 17 00:00:00 2001 From: Sebastien Cote Date: Sun, 6 Jun 2004 19:44:19 +0000 Subject: [PATCH] fix copyright in header and typo in debugging category name Original commit message from CVS: * gst/gstqueue.c: (gst_queue_dispose), (gst_queue_change_state): fix memory leaks (fixes #142795). Initial patch by Sebastien Cote * libs/gst/bytestream/adapter.c: * libs/gst/bytestream/adapter.h: fix copyright in header and typo in debugging category name --- ChangeLog | 8 ++++++++ gst/gstqueue.c | 2 ++ libs/gst/bytestream/adapter.c | 4 ++-- libs/gst/bytestream/adapter.h | 2 +- plugins/elements/gstqueue.c | 2 ++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e467744..8ad73d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-06-06 Benjamin Otte + + * gst/gstqueue.c: (gst_queue_dispose), (gst_queue_change_state): + fix memory leaks (fixes #142795). Initial patch by Sebastien Cote + * libs/gst/bytestream/adapter.c: + * libs/gst/bytestream/adapter.h: + fix copyright in header and typo in debugging category name + 2004-06-05 Thomas Vander Stichele * configure.ac: diff --git a/gst/gstqueue.c b/gst/gstqueue.c index f13d9f5..0f6c076 100644 --- a/gst/gstqueue.c +++ b/gst/gstqueue.c @@ -316,6 +316,7 @@ gst_queue_dispose (GObject * object) gst_event_unref (event); } + g_queue_free (queue->events); if (G_OBJECT_CLASS (parent_class)->dispose) G_OBJECT_CLASS (parent_class)->dispose (object); @@ -892,6 +893,7 @@ gst_queue_change_state (GstElement * element) break; case GST_STATE_PAUSED_TO_READY: gst_queue_locked_flush (queue); + gst_caps_replace (&queue->negotiated_caps, NULL); break; default: break; diff --git a/libs/gst/bytestream/adapter.c b/libs/gst/bytestream/adapter.c index fb050b0..87fb5f8 100644 --- a/libs/gst/bytestream/adapter.c +++ b/libs/gst/bytestream/adapter.c @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) 2001 Erik Walthinsen + * Copyright (C) 2004 Benjamin Otte * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -27,7 +27,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_adapter_debug); #define GST_CAT_DEFAULT gst_adapter_debug #define _do_init(thing) \ - GST_DEBUG_CATEGORY_INIT (gst_adapter_debug, "GstAdapter", 0, "object to splice and merge buffers to dewsired size") + GST_DEBUG_CATEGORY_INIT (gst_adapter_debug, "GstAdapter", 0, "object to splice and merge buffers to desired size") GST_BOILERPLATE_FULL (GstAdapter, gst_adapter, GObject, G_TYPE_OBJECT, _do_init) static void gst_adapter_dispose (GObject * object); diff --git a/libs/gst/bytestream/adapter.h b/libs/gst/bytestream/adapter.h index d91fdb8..4257cf5 100644 --- a/libs/gst/bytestream/adapter.h +++ b/libs/gst/bytestream/adapter.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) 2001 Erik Walthinsen + * Copyright (C) 2004 Benjamin Otte * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index f13d9f5..0f6c076 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -316,6 +316,7 @@ gst_queue_dispose (GObject * object) gst_event_unref (event); } + g_queue_free (queue->events); if (G_OBJECT_CLASS (parent_class)->dispose) G_OBJECT_CLASS (parent_class)->dispose (object); @@ -892,6 +893,7 @@ gst_queue_change_state (GstElement * element) break; case GST_STATE_PAUSED_TO_READY: gst_queue_locked_flush (queue); + gst_caps_replace (&queue->negotiated_caps, NULL); break; default: break; -- 2.7.4