asfdemux: Don't use GST_FLOW_IS_FATAL()

And don't post error messages for UNEXPECTED and post an error
message if pulling data failed because of NOT_LINKED.
This commit is contained in:
Sebastian Dröge 2010-08-27 18:19:00 +02:00
parent 080b3673a9
commit 704b371944

View file

@ -385,7 +385,7 @@ gst_asf_demux_sink_event (GstPad * pad, GstEvent * event)
break; break;
} }
flow = gst_asf_demux_push_complete_payloads (demux, TRUE); flow = gst_asf_demux_push_complete_payloads (demux, TRUE);
if (GST_FLOW_IS_FATAL (flow) || flow == GST_FLOW_NOT_LINKED) { if (flow < GST_FLOW_UNEXPECTED || flow == GST_FLOW_NOT_LINKED) {
GST_ELEMENT_ERROR (demux, STREAM, FAILED, GST_ELEMENT_ERROR (demux, STREAM, FAILED,
(_("Internal data stream error.")), (_("Internal data stream error.")),
("streaming stopped, reason %s", gst_flow_get_name (flow))); ("streaming stopped, reason %s", gst_flow_get_name (flow)));
@ -1522,7 +1522,7 @@ gst_asf_demux_loop (GstASFDemux * demux)
GST_DEBUG_OBJECT (demux, "got flow %s", gst_flow_get_name (flow)); GST_DEBUG_OBJECT (demux, "got flow %s", gst_flow_get_name (flow));
if (flow == GST_FLOW_UNEXPECTED) if (flow == GST_FLOW_UNEXPECTED)
goto eos; goto eos;
else if (!GST_FLOW_IS_FATAL (flow)) { else if (flow == GST_FLOW_WRONG_STATE) {
GST_DEBUG_OBJECT (demux, "Not fatal"); GST_DEBUG_OBJECT (demux, "Not fatal");
goto pause; goto pause;
} else } else