diff options
author | Tommi Myöhänen <ext-tommi.1.myohanen@nokia.com> | 2009-07-31 11:27:03 +0300 |
---|---|---|
committer | Stefan Kost <ensonic@users.sf.net> | 2009-07-31 14:07:31 +0300 |
commit | b6582939256d417ed5f2eae3c66d7b4cf0c668fc (patch) | |
tree | 6d5c9d579ba209e7d36cbd0ede7027ba2f500424 /gst | |
parent | 89788ddc1f4caa951880ac0402499fb62690f980 (diff) | |
download | gst-plugins-bad-b6582939256d417ed5f2eae3c66d7b4cf0c668fc.tar.gz gst-plugins-bad-b6582939256d417ed5f2eae3c66d7b4cf0c668fc.tar.bz2 gst-plugins-bad-b6582939256d417ed5f2eae3c66d7b4cf0c668fc.zip |
outputselector: check for pending srcpad in _get_property()
If there is a pending srcpad, return it instead of active srcpad
in gst_output_selector_get_property() function.
Diffstat (limited to 'gst')
-rw-r--r-- | gst/selector/gstoutputselector.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gst/selector/gstoutputselector.c b/gst/selector/gstoutputselector.c index 15c0a726..f5c89eef 100644 --- a/gst/selector/gstoutputselector.c +++ b/gst/selector/gstoutputselector.c @@ -238,7 +238,8 @@ gst_output_selector_get_property (GObject * object, guint prop_id, switch (prop_id) { case PROP_ACTIVE_PAD: GST_OBJECT_LOCK (object); - g_value_set_object (value, sel->active_srcpad); + g_value_set_object (value, + sel->pending_srcpad ? sel->pending_srcpad : sel->active_srcpad); GST_OBJECT_UNLOCK (object); break; case PROP_RESEND_LATEST:{ |