summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-01-04 10:02:28 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2012-01-04 10:02:28 +0100
commitacfa55df6c79847c80c3ff69dd32efa827d3c682 (patch)
tree3dda1ea0809104b8666be07a896b0579016a5170
parentb592f431e3c972966e5dac970840bb711d26722d (diff)
downloadgstreamer-plugins-bad-acfa55df6c79847c80c3ff69dd32efa827d3c682.tar.gz
GST_FLOW_UNEXPECTED -> GST_FLOW_EOS
-rw-r--r--ext/gme/gstgme.c5
-rw-r--r--ext/rtmp/gstrtmpsrc.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/ext/gme/gstgme.c b/ext/gme/gstgme.c
index eda7e3f27..7a70c7a3c 100644
--- a/ext/gme/gstgme.c
+++ b/ext/gme/gstgme.c
@@ -380,10 +380,9 @@ gst_gme_play (GstPad * pad)
gst_pad_pause_task (pad);
- if (flow_return == GST_FLOW_UNEXPECTED) {
+ if (flow_return == GST_FLOW_EOS) {
gst_pad_push_event (pad, gst_event_new_eos ());
- } else if (flow_return < GST_FLOW_UNEXPECTED
- || flow_return == GST_FLOW_NOT_LINKED) {
+ } else if (flow_return < GST_FLOW_EOS || flow_return == GST_FLOW_NOT_LINKED) {
GST_ELEMENT_ERROR (gme, STREAM, FAILED, ("Internal data stream error."),
("stream stopped, reason %s", gst_flow_get_name (flow_return)));
diff --git a/ext/rtmp/gstrtmpsrc.c b/ext/rtmp/gstrtmpsrc.c
index 28f5ea568..1f0ba8519 100644
--- a/ext/rtmp/gstrtmpsrc.c
+++ b/ext/rtmp/gstrtmpsrc.c
@@ -379,7 +379,7 @@ eos:
{
gst_buffer_unref (buf);
GST_DEBUG_OBJECT (src, "Reading data gave EOS");
- return GST_FLOW_UNEXPECTED;
+ return GST_FLOW_EOS;
}
}