avviddec: Ignore negotiation error on shutdown
authorOlivier Crête <olivier.crete@collabora.com>
Thu, 23 Jul 2015 23:15:43 +0000 (19:15 -0400)
committerOlivier Crête <olivier.crete@collabora.com>
Mon, 27 Jul 2015 17:58:43 +0000 (13:58 -0400)
https://bugzilla.gnome.org/show_bug.cgi?id=752800

ext/libav/gstavviddec.c

index 8ebe047..c5b7a3f 100644 (file)
@@ -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;