From f731208bcddec6749f9c1af0b171ea3780266c57 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 8 Feb 2012 16:38:09 +0100 Subject: [PATCH] GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING --- ext/amrnb/amrnbenc.c | 2 +- gst/asfdemux/gstasfdemux.c | 2 +- gst/realmedia/rdtmanager.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/amrnb/amrnbenc.c b/ext/amrnb/amrnbenc.c index 09ff0e1..3c393de 100644 --- a/ext/amrnb/amrnbenc.c +++ b/ext/amrnb/amrnbenc.c @@ -246,7 +246,7 @@ gst_amrnbenc_handle_frame (GstAudioEncoder * enc, GstBuffer * buffer) amrnbenc = GST_AMRNBENC (enc); - g_return_val_if_fail (amrnbenc->handle, GST_FLOW_WRONG_STATE); + g_return_val_if_fail (amrnbenc->handle, GST_FLOW_FLUSHING); /* we don't deal with squeezing remnants, so simply discard those */ if (G_UNLIKELY (buffer == NULL)) { diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 37738ef..aa8e200 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -1578,7 +1578,7 @@ gst_asf_demux_loop (GstASFDemux * demux) GST_DEBUG_OBJECT (demux, "got flow %s", gst_flow_get_name (flow)); if (flow == GST_FLOW_EOS) goto eos; - else if (flow == GST_FLOW_WRONG_STATE) { + else if (flow == GST_FLOW_FLUSHING) { GST_DEBUG_OBJECT (demux, "Not fatal"); goto pause; } else diff --git a/gst/realmedia/rdtmanager.c b/gst/realmedia/rdtmanager.c index e2b2d0f..bb37a06 100644 --- a/gst/realmedia/rdtmanager.c +++ b/gst/realmedia/rdtmanager.c @@ -593,7 +593,7 @@ gst_rdt_manager_src_activate_mode (GstPad * pad, GstObject * parent, /* make sure all data processing stops ASAP */ JBUF_LOCK (session); /* mark ourselves as flushing */ - session->srcresult = GST_FLOW_WRONG_STATE; + session->srcresult = GST_FLOW_FLUSHING; GST_DEBUG_OBJECT (rdtmanager, "Disabling pop on queue"); /* this unblocks any waiting pops on the src pad task */ JBUF_SIGNAL (session); -- 2.7.4