From 4e49d589172b7e87bbc443c8d692ebb1783b71d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 17 Mar 2011 13:47:10 +0100 Subject: [PATCH] playbin2: Only consider the audio/video sinks in autoplug_continue for the normal uridecodebin Considering them for the subtitle uridecodebin will add audio/video streams that might be in a file used as subtitle file. --- gst/playback/gstplaybin2.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index 8d6dbcc..a2082ba 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -2972,9 +2972,17 @@ autoplug_continue_cb (GstElement * element, GstPad * pad, GstCaps * caps, ret = !gst_caps_can_intersect (caps, subcaps); gst_caps_unref (subcaps); } + /* If autoplugging can stop don't do additional checks */ if (!ret) goto done; + /* If this is from the subtitle uridecodebin we don't need to + * check the audio and video sink */ + if (group->suburidecodebin + && gst_object_has_ancestor (GST_OBJECT_CAST (element), + GST_OBJECT_CAST (group->suburidecodebin))) + goto done; + if ((sink = group->playbin->audio_sink)) { sinkpad = gst_element_get_static_pad (sink, "sink"); if (sinkpad) { -- 2.7.4