diff --git a/ChangeLog b/ChangeLog index c3b85acb9b..1e39b22a1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-02 Tim-Philipp Müller + + * gst/playback/gstdecodebin.c: (try_to_link_1): + Unlinking two source pads is ... hard. + 2006-02-02 Wim Taymans * gst-libs/gst/audio/TODO: diff --git a/common b/common index 1140eabed8..79d67fe009 160000 --- 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 9298b74e7a..883d40180a 100644 --- 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);