[0.11] gst-ffmpeg: GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING

[Wim Taymans]

Module: gst-ffmpeg
Branch: 0.11
Commit: b5609f651e68c31feeb4d2887e167f9192e22c6d
URL:    http://cgit.freedesktop.org/gstreamer/gst-ffmpeg/commit/?id=b5609f651e68c31feeb4d2887e167f9192e22c6d

Author: Wim Taymans <wim.taymans at collabora.co.uk>
Date:   Wed Feb  8 16:41:19 2012 +0100

GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING

---

 ext/ffmpeg/gstffmpegdemux.c    |    8 ++++----
 ext/ffmpeg/gstffmpegprotocol.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 4d0ba34..e202c29 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1509,7 +1509,7 @@ read_failed:
     GST_OBJECT_LOCK (demux);
     /* pause appropriatly based on if we are flushing or not */
     if (demux->flushing)
-      ret = GST_FLOW_WRONG_STATE;
+      ret = GST_FLOW_FLUSHING;
     else if (gst_ffmpegdemux_has_outputted (demux)
         || gst_ffmpegdemux_is_eos (demux)) {
       GST_DEBUG_OBJECT (demux, "We are EOS");
@@ -1562,7 +1562,7 @@ gst_ffmpegdemux_sink_event (GstPad * sinkpad, GstObject * parent,
 
       /* now unblock the chain function */
       GST_FFMPEG_PIPE_MUTEX_LOCK (ffpipe);
-      ffpipe->srcresult = GST_FLOW_WRONG_STATE;
+      ffpipe->srcresult = GST_FLOW_FLUSHING;
       GST_FFMPEG_PIPE_SIGNAL (ffpipe);
       GST_FFMPEG_PIPE_MUTEX_UNLOCK (ffpipe);
 
@@ -1680,7 +1680,7 @@ ignore:
 
     if (buffer)
       gst_buffer_unref (buffer);
-    return GST_FLOW_WRONG_STATE;
+    return GST_FLOW_FLUSHING;
   }
 }
 
@@ -1742,7 +1742,7 @@ gst_ffmpegdemux_sink_activate_push (GstPad * sinkpad, GstObject * parent,
 
     /* release chain and loop */
     GST_FFMPEG_PIPE_MUTEX_LOCK (ffpipe);
-    demux->ffpipe.srcresult = GST_FLOW_WRONG_STATE;
+    demux->ffpipe.srcresult = GST_FLOW_FLUSHING;
     /* end streaming by making ffmpeg believe eos */
     demux->ffpipe.eos = TRUE;
     GST_FFMPEG_PIPE_SIGNAL (ffpipe);
diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/ffmpeg/gstffmpegprotocol.c
index 4813716..431b14b 100644
--- a/ext/ffmpeg/gstffmpegprotocol.c
+++ b/ext/ffmpeg/gstffmpegprotocol.c
@@ -118,7 +118,7 @@ gst_ffmpegdata_peek (URLContext * h, unsigned char *buf, int size)
     case GST_FLOW_EOS:
       total = 0;
       break;
-    case GST_FLOW_WRONG_STATE:
+    case GST_FLOW_FLUSHING:
       total = -1;
       break;
     default: