From: Brandon Lewis <brandon@collabora.co.uk>
Date: Mon, 28 Jun 2010 16:20:15 +0000 (+0200)
Subject: free mixer in dispose separately from sink pads
X-Git-Tag: 1.19.3~493^2~2835
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d4ff040d29b97a391907b8eef5e0775ae6a4809;p=platform%2Fupstream%2Fgstreamer.git

free mixer in dispose separately from sink pads
---

diff --git a/ges/ges-track-video-transition.c b/ges/ges-track-video-transition.c
index a9894f1..1ea8e92 100644
--- a/ges/ges-track-video-transition.c
+++ b/ges/ges-track-video-transition.c
@@ -109,18 +109,22 @@ ges_track_video_transition_dispose (GObject * object)
     self->control_source = NULL;
   }
 
-  if (self->mixer && self->sinka && self->sinkb) {
+  if (self->sinka && self->sinkb) {
     GST_DEBUG ("releasing request pads for mixer");
     gst_element_release_request_pad (self->mixer, self->sinka);
     gst_element_release_request_pad (self->mixer, self->sinkb);
-    gst_object_unref (self->mixer);
     gst_object_unref (self->sinka);
     gst_object_unref (self->sinkb);
-    self->mixer = NULL;
     self->sinka = NULL;
     self->sinkb = NULL;
   }
 
+  if (self->mixer) {
+    GST_LOG ("unrefing mixer");
+    gst_object_unref (self->mixer);
+    self->mixer = NULL;
+  }
+
   G_OBJECT_CLASS (ges_track_video_transition_parent_class)->dispose (object);
 }