diff options
author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2015-07-23 19:15:43 -0400 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2015-07-27 13:58:43 -0400 |
commit | 6bfe79d903d8d855b16a8136d15b631aaf01de5b (patch) | |
tree | 2412e29c1f072d62008ad0aaa4998e725b69e283 | |
parent | 7afaf5c02050fcac18006abfdc01287f8dba16eb (diff) | |
download | gst-libav-6bfe79d903d8d855b16a8136d15b631aaf01de5b.tar.gz |
avviddec: Ignore negotiation error on shutdown
https://bugzilla.gnome.org/show_bug.cgi?id=752800
-rw-r--r-- | ext/libav/gstavviddec.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |