diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-08-09 00:14:27 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-08-09 00:14:27 -0400 |
| commit | dd5afbf0c6557ad89994cbfd91e4117e8503b81a (patch) | |
| tree | 4f18322a717c6dbe64b8b38194e302b1668dcb3d /gst/selector | |
| parent | 5d9d4a7b518c42bda88c7f6c87ce7c3c01233562 (diff) | |
| parent | 6115e0cb0ef3ae85397297c7e30c2e9b4a0a181e (diff) | |
| download | gst-plugins-bad-dd5afbf0c6557ad89994cbfd91e4117e8503b81a.tar.gz gst-plugins-bad-dd5afbf0c6557ad89994cbfd91e4117e8503b81a.tar.bz2 gst-plugins-bad-dd5afbf0c6557ad89994cbfd91e4117e8503b81a.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
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:{ |