mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/asfdemux/gstasfdemux.c: Fix aggregated GST_FLOW_RETURN check for when to send an error message on the bus.

Browse source 
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
This commit is contained in:
Edward Hervey 2008-08-28 09:57:30 +00:00
parent ff1503f5cf
commit def71526d9
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2008-08-27 Wim Taymans <wim.taymans@collabora.co.uk>
* gst/realmedia/rdtdepay.c: (gst_rdt_depay_init), * gst/realmedia/rdtdepay.c: (gst_rdt_depay_init),

4
gst/asfdemux/gstasfdemux.c
View file

@ -1333,7 +1333,7 @@ eos:
if (!demux->activated_streams) if (!demux->activated_streams)
flow = gst_asf_demux_push_complete_payloads (demux, TRUE); 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"); GST_DEBUG_OBJECT (demux, "pushing complete payloads failed");
goto pause; goto pause;
} }
@ -1365,7 +1365,7 @@ pause:
gst_pad_pause_task (demux->sinkpad); gst_pad_pause_task (demux->sinkpad);
/* For the error cases (not EOS) */ /* 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... */ /* Post an error. Hopefully something else already has, but if not... */
GST_ELEMENT_ERROR (demux, STREAM, FAILED, GST_ELEMENT_ERROR (demux, STREAM, FAILED,
(_("Internal data stream error.")), (_("Internal data stream error.")),