gst/playback/gstdecodebin.c: Unlinking two source pads is ... hard.

Original commit message from CVS:
* gst/playback/gstdecodebin.c: (try_to_link_1):
Unlinking two source pads is ... hard.

diff --git a/ChangeLog b/ChangeLog
index c3b85acb9bd4e50dfea815e10e1b3cdd9fe55ef7..1e39b22a1a3c2fbf9587a4175e711bd4697d4549 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-02  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/playback/gstdecodebin.c: (try_to_link_1):
+         Unlinking two source pads is ... hard.
+
 2006-02-02  Wim Taymans  <wim@fluendo.com>
 
        * gst-libs/gst/audio/TODO:

diff --git a/common b/common
index 1140eabed84dd1d8d6df7df88f5c8bdf20a8faa1..79d67fe009b6120b82d51df860c78e8361f02aea 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 1140eabed84dd1d8d6df7df88f5c8bdf20a8faa1
+Subproject commit 79d67fe009b6120b82d51df860c78e8361f02aea

diff --git a/gst/playback/gstdecodebin.c b/gst/playback/gstdecodebin.c
index 9298b74e7a8243ee8c21975dc6518b84e428bb1e..883d40180aad27d87e98ef5d60ac902f38778a8f 100644 (file)
--- a/gst/playback/gstdecodebin.c
+++ b/gst/playback/gstdecodebin.c
@@ -838,7 +838,7 @@ try_to_link_1 (GstDecodeBin * decode_bin, GstElement * srcelement, GstPad * pad,
 done:
   if (queue != NULL) {
     /* We didn't successfully connect to the queue */
-    gst_pad_unlink (pad, queuesrcpad);
+    gst_pad_unlink (pad, queuesinkpad);
     gst_element_set_state (queue, GST_STATE_NULL);
     gst_object_unref (queuesrcpad);
     gst_object_unref (queuesinkpad);