From 6bfe79d903d8d855b16a8136d15b631aaf01de5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Thu, 23 Jul 2015 19:15:43 -0400
Subject: avviddec: Ignore negotiation error on shutdown

https://bugzilla.gnome.org/show_bug.cgi?id=752800
---
 ext/libav/gstavviddec.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
index 8ebe047..c5b7a3f 100644
--- a/ext/libav/gstavviddec.c
+++ b/ext/libav/gstavviddec.c
@@ -1378,6 +1378,10 @@ no_output:
 
 negotiation_error:
   {
+    if (GST_PAD_IS_FLUSHING (GST_VIDEO_DECODER_SRC_PAD (ffmpegdec))) {
+      *ret = GST_FLOW_FLUSHING;
+      goto beach;
+    }
     GST_WARNING_OBJECT (ffmpegdec, "Error negotiating format");
     *ret = GST_FLOW_NOT_NEGOTIATED;
     goto beach;
-- 
cgit v1.2.1