gst/selector/gstoutputselector.c: Choose right pad for sending events. Fixes #555244

Original commit message from CVS:
* gst/selector/gstoutputselector.c:
Choose right pad for sending events. Fixes #555244
This commit is contained in:
Stefan Kost 2008-10-07 13:14:40 +00:00
parent dbc5475c97
commit ae65d3945b
2 changed files with 10 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2008-10-07 Stefan Kost <ensonic@users.sf.net>
* gst/selector/gstoutputselector.c:
Choose right pad for sending events. Fixes #555244
2008-10-07 Wim Taymans <wim.taymans@collabora.co.uk> 2008-10-07 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/rtpmanager/gstrtpbin.c: (find_session_by_pad), * gst/rtpmanager/gstrtpbin.c: (find_session_by_pad),

View file

@ -387,6 +387,7 @@ gst_output_selector_handle_sink_event (GstPad * pad, GstEvent * event)
{ {
gboolean res = TRUE; gboolean res = TRUE;
GstOutputSelector *sel; GstOutputSelector *sel;
GstPad *output_pad = NULL;
sel = GST_OUTPUT_SELECTOR (gst_pad_get_parent (pad)); sel = GST_OUTPUT_SELECTOR (gst_pad_get_parent (pad));
@ -419,8 +420,10 @@ gst_output_selector_handle_sink_event (GstPad * pad, GstEvent * event)
gst_pad_event_default (pad, event); gst_pad_event_default (pad, event);
break; break;
default: default:
/* Send other events to active src pad */ /* Send other events to pending or active src pad */
res = gst_pad_push_event (sel->active_srcpad, event); output_pad =
sel->pending_srcpad ? sel->pending_srcpad : sel->active_srcpad;
res = gst_pad_push_event (output_pad, event);
break; break;
} }