summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2015-07-23 18:15:05 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2015-07-27 13:53:26 -0400
commit5e5a14028a8605f957b5acf2c2170850d02a7b51 (patch)
tree0863942dee2a8ad0c18a5af7217b65d58db1c3e4
parent815b5f69e805c032fc11c77c36e5b8ab5929856d (diff)
basetransform: Return FLOW_FLUSHING if negotiation fails during shutdown
https://bugzilla.gnome.org/show_bug.cgi?id=752800
-rw-r--r--libs/gst/base/gstbasetransform.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index ecf53455d..3433178a6 100644
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -2117,6 +2117,8 @@ skip:
not_negotiated:
{
gst_buffer_unref (inbuf);
+ if (GST_PAD_IS_FLUSHING (trans->srcpad))
+ return GST_FLOW_FLUSHING;
GST_ELEMENT_WARNING (trans, STREAM, FORMAT,
("not negotiated"), ("not negotiated"));
return GST_FLOW_NOT_NEGOTIATED;