diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-08-27 18:33:49 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-09-21 12:26:34 +0200 |
| commit | b68a1e805d11e61fda9a2bcd866e8bea7cd272d8 (patch) | |
| tree | 8054bdcc745c9afbbfc4cb073112632b656d708d | |
| parent | 5816dbce6fb8df7455b24124e1fb7fe7e947b916 (diff) | |
asfparse: Don't use GST_FLOW_IS_FATAL()
Also don't push EOS downstream on WRONG_STATE, it will be dropped anyway.
| -rw-r--r-- | gst/asfmux/gstasfparse.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gst/asfmux/gstasfparse.c b/gst/asfmux/gstasfparse.c index 44b2acbe9..677ea3b18 100644 --- a/gst/asfmux/gstasfparse.c +++ b/gst/asfmux/gstasfparse.c @@ -352,12 +352,11 @@ pause: GST_INFO_OBJECT (asfparse, "Pausing sinkpad task"); gst_pad_pause_task (pad); - if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) { - if (ret == GST_FLOW_UNEXPECTED) { - } else { - GST_ELEMENT_ERROR (asfparse, STREAM, FAILED, - (NULL), ("streaming task paused, reason %s (%d)", reason, ret)); - } + if (ret == GST_FLOW_UNEXPECTED) { + gst_pad_push_event (asfparse->srcpad, gst_event_new_eos ()); + } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) { + GST_ELEMENT_ERROR (asfparse, STREAM, FAILED, + (NULL), ("streaming task paused, reason %s (%d)", reason, ret)); gst_pad_push_event (asfparse->srcpad, gst_event_new_eos ()); } } |