pad-monitor: fix aggregate flow return check for error situations

Flow flushing must be returned upstream to indicate an error situation
downstream
This commit is contained in:
Thiago Santos 2013-08-26 18:36:06 -03:00
parent 185d10bf79
commit 1a54b40c78

View file

@ -773,6 +773,8 @@ _combine_flows (GstFlowReturn ret1, GstFlowReturn ret2)
return ret1;
if (ret2 <= GST_FLOW_NOT_NEGOTIATED)
return ret2;
if (ret1 == GST_FLOW_FLUSHING || ret2 == GST_FLOW_FLUSHING)
return GST_FLOW_FLUSHING;
if (ret1 == GST_FLOW_OK || ret2 == GST_FLOW_OK)
return GST_FLOW_OK;
return ret2;