summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2006-06-23 09:35:45 +0000
committerWim Taymans <wim.taymans@gmail.com>2006-06-23 09:35:45 +0000
commitc00aec3f154737829a1fd002abb27223c871bd9c (patch)
tree5d895828a7e124a3d11dc15a5f603e4c220cd369
parent05eaedc496de5e686a5a6d875598104459d60af6 (diff)
gst/goom/gstgoom.c: Fix double caps unref when negotiation fails.
Original commit message from CVS: * gst/goom/gstgoom.c: (gst_goom_src_negotiate): Fix double caps unref when negotiation fails.
-rw-r--r--ChangeLog5
-rw-r--r--gst/goom/gstgoom.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c5777bc9..eab5369f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-23 Wim Taymans <wim@fluendo.com>
+
+ * gst/goom/gstgoom.c: (gst_goom_src_negotiate):
+ Fix double caps unref when negotiation fails.
+
2006-06-22 Tim-Philipp Müller <tim at centricular dot net>
* ext/annodex/gstcmmldec.c:
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index f728ada1..26334316 100644
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -264,6 +264,8 @@ gst_goom_src_negotiate (GstGoom * goom)
templ = gst_pad_get_pad_template_caps (goom->srcpad);
+ GST_DEBUG_OBJECT (goom, "performing negotiation");
+
/* see what the peer can do */
othercaps = gst_pad_peer_get_caps (goom->srcpad);
if (othercaps) {
@@ -292,7 +294,6 @@ gst_goom_src_negotiate (GstGoom * goom)
no_format:
{
gst_caps_unref (intersect);
- gst_caps_unref (othercaps);
return FALSE;
}
}