diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-08-09 00:14:42 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-08-09 00:14:42 -0400 |
| commit | af3f7e7f20eaf961f4384940ec6ad987bb0afbb6 (patch) | |
| tree | c42a7ad4f2dea47dd645a729a6ee0399bd80cfb1 /gst/selector | |
| parent | adadf06b0a9e26005ba9363aa0049dc0b740c94d (diff) | |
| parent | dd5afbf0c6557ad89994cbfd91e4117e8503b81a (diff) | |
| download | gst-plugins-bad-af3f7e7f20eaf961f4384940ec6ad987bb0afbb6.tar.gz gst-plugins-bad-af3f7e7f20eaf961f4384940ec6ad987bb0afbb6.tar.bz2 gst-plugins-bad-af3f7e7f20eaf961f4384940ec6ad987bb0afbb6.zip | |
Merge branch 'fdo' into lv2
Diffstat (limited to 'gst/selector')
| -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:{ |