gst/asfdemux/gstasfdemux.c: Fix aggregated GST_FLOW_RETURN check for when to send...

Original commit message from CVS:
* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_loop):
Fix aggregated GST_FLOW_RETURN check for when to send an error message
on the bus.
Re-fixes #546859

diff --git a/ChangeLog b/ChangeLog
index 12a06041508b641b34c3e23673f06d65aa18217f..0832881849c1a39cbd78597cf020d91814ec02ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-28  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+       * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_loop):
+       Fix aggregated GST_FLOW_RETURN check for when to send an error message
+       on the bus.
+       Re-fixes #546859
+
 2008-08-27  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        * gst/realmedia/rdtdepay.c: (gst_rdt_depay_init),

diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 2fed43f09105f307b1e7beaa8ab328df67042927..04d5afda40a6e6e7c20571bfecf55abb6adb086a 100644 (file)
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -1333,7 +1333,7 @@ eos:
     if (!demux->activated_streams)
       flow = gst_asf_demux_push_complete_payloads (demux, TRUE);
 
-    if (flow != GST_FLOW_OK && flow != GST_FLOW_UNEXPECTED) {
+    if (GST_FLOW_IS_FATAL (flow) || flow == GST_FLOW_NOT_LINKED) {
       GST_DEBUG_OBJECT (demux, "pushing complete payloads failed");
       goto pause;
     }
@@ -1365,7 +1365,7 @@ pause:
     gst_pad_pause_task (demux->sinkpad);
 
     /* For the error cases (not EOS) */
-    if (flow != GST_FLOW_OK && flow != GST_FLOW_UNEXPECTED) {
+    if (GST_FLOW_IS_FATAL (flow) || flow == GST_FLOW_NOT_LINKED) {
       /* Post an error. Hopefully something else already has, but if not... */
       GST_ELEMENT_ERROR (demux, STREAM, FAILED,
           (_("Internal data stream error.")),