[0.11] gst-plugins-bad: GST_FLOW_UNEXPECTED -> GST_FLOW_EOS

[Wim Taymans]

Module: gst-plugins-bad
Branch: 0.11
Commit: acfa55df6c79847c80c3ff69dd32efa827d3c682
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=acfa55df6c79847c80c3ff69dd32efa827d3c682

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Wed Jan  4 10:02:28 2012 +0100

GST_FLOW_UNEXPECTED -> GST_FLOW_EOS

---

 ext/gme/gstgme.c      |    5 ++---
 ext/rtmp/gstrtmpsrc.c |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ext/gme/gstgme.c b/ext/gme/gstgme.c
index eda7e3f..7a70c7a 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 28f5ea5..1f0ba85 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;
   }
 }