diff options
author | Edward Hervey <bilboed@bilboed.com> | 2008-10-15 17:45:37 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-12-31 00:53:47 +0000 |
commit | acafa09a742ef8c5c9ab5dd9469b09b69fb2bc72 (patch) | |
tree | f1515e94d2a92168a089e967c3fc3bc16e9720e5 | |
parent | 832f2f46e7adf03bcd3526071e9bb41f03f4bb40 (diff) |
plugins/elements/gstinputselector.c: Gracefully handle the cases when we dont' have otherpad.
Original commit message from CVS:
* plugins/elements/gstinputselector.c: (gst_input_selector_event),
(gst_input_selector_query):
Gracefully handle the cases when we dont' have otherpad.
Fixes #556430
-rw-r--r-- | plugins/elements/gstinputselector.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c index 45f2af9ded..c175a5e027 100644 --- a/plugins/elements/gstinputselector.c +++ b/plugins/elements/gstinputselector.c @@ -1017,15 +1017,16 @@ gst_input_selector_get_linked_pad (GstPad * pad, gboolean strict) static gboolean gst_input_selector_event (GstPad * pad, GstEvent * event) { - gboolean res; + gboolean res = FALSE; GstPad *otherpad; otherpad = gst_input_selector_get_linked_pad (pad, TRUE); - res = gst_pad_push_event (otherpad, event); - - gst_object_unref (otherpad); + if (otherpad) { + res = gst_pad_push_event (otherpad, event); + gst_object_unref (otherpad); + } return res; } @@ -1034,7 +1035,7 @@ gst_input_selector_event (GstPad * pad, GstEvent * event) static gboolean gst_input_selector_query (GstPad * pad, GstQuery * query) { - gboolean res; + gboolean res = TRUE; GstInputSelector *sel; GstPad *otherpad; @@ -1101,10 +1102,12 @@ gst_input_selector_query (GstPad * pad, GstQuery * query) break; } default: - res = gst_pad_peer_query (otherpad, query); + if (otherpad) + res = gst_pad_peer_query (otherpad, query); break; } - gst_object_unref (otherpad); + if (otherpad) + gst_object_unref (otherpad); gst_object_unref (sel); return res; |