pad-monitor: fix aggregate flow return check for error situations
authorThiago Santos <thiago.sousa.santos@collabora.com>
Mon, 26 Aug 2013 21:36:06 +0000 (18:36 -0300)
committerThiago Santos <thiago.sousa.santos@collabora.com>
Mon, 26 Aug 2013 23:33:22 +0000 (20:33 -0300)
Flow flushing must be returned upstream to indicate an error situation
downstream

validate/gst/validate/gst-validate-pad-monitor.c

index ec614d68dce95ed3ac3f3e17cbaac833fae2e4ab..f542f691d70d4dd7ac30a5c593daf8c110b662dc 100644 (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;