gst/playback/gstdecodebin2.c: When autoplugging fails, set the element back to NULL...

Original commit message from CVS:
* gst/playback/gstdecodebin2.c: (connect_pad):
When autoplugging fails, set the element back to NULL before
unreffing it.

diff --git a/ChangeLog b/ChangeLog
index d4c02c9e27f84145e67e89ca7b2a82b239789088..841c95ac3f885eb718afb197cf1b2fe38d6f1657 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-06  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+       * gst/playback/gstdecodebin2.c: (connect_pad):
+       When autoplugging fails, set the element back to NULL before
+       unreffing it.
+
 2008-05-06  Sebastian Dröge  <slomo@circular-chaos.org>
 
        * win32/common/libgstaudio.def:

diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index 1b97b5c6e6a12b32cdb616d97d0ce50e3b5d9c36..729cc08402469e48db9654e44e2a7483e385ec31 100644 (file)
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -1150,6 +1150,7 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
     if (!(sinkpad = find_sink_pad (element))) {
       GST_WARNING_OBJECT (dbin, "Element %s doesn't have a sink pad",
           GST_ELEMENT_NAME (element));
+      gst_element_set_state (element, GST_STATE_NULL);
       gst_object_unref (element);
       continue;
     }
@@ -1159,6 +1160,7 @@ connect_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
       GST_WARNING_OBJECT (dbin, "Couldn't add %s to the bin",
           GST_ELEMENT_NAME (element));
       gst_object_unref (sinkpad);
+      gst_element_set_state (element, GST_STATE_NULL);
       gst_object_unref (element);
       continue;
     }