From def71526d9f73c18ac71520658d70cb660dac229 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Thu, 28 Aug 2008 09:57:30 +0000 Subject: [PATCH] gst/asfdemux/gstasfdemux.c: Fix aggregated GST_FLOW_RETURN check for when to send an error message on the bus. 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 --- ChangeLog | 7 +++++++ gst/asfdemux/gstasfdemux.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12a0604150..0832881849 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-28 Edward Hervey + + * 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 * gst/realmedia/rdtdepay.c: (gst_rdt_depay_init), diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 2fed43f091..04d5afda40 100644 --- 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.")),