summaryrefslogtreecommitdiff
path: root/gst/avi
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@ocrete.ca>2015-07-25 03:25:28 -0400
committerOlivier CrĂȘte <olivier.crete@ocrete.ca>2015-07-25 03:25:28 -0400
commit7917bea855307da5b9fc515f581c0197c3903845 (patch)
treefda061eea6bbad5c5c612eb6e8d37c318fdc63e6 /gst/avi
parentafcd462918e3e43036c709c53ed85434879e8134 (diff)
downloadgstreamer-plugins-good-7917bea855307da5b9fc515f581c0197c3903845.tar.gz
avidemux: Stop without posting error on flushing
This could just be a normal pipeline shutdown.
Diffstat (limited to 'gst/avi')
-rw-r--r--gst/avi/gstavidemux.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index f2bebafd0..56916e725 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -4355,9 +4355,11 @@ no_index:
}
pull_range_failed:
{
+ if (res == GST_FLOW_FLUSHING)
+ return res;
GST_ELEMENT_ERROR (avi, STREAM, DEMUX, (NULL),
("pull_range flow reading header: %s", gst_flow_get_name (res)));
- return GST_FLOW_ERROR;
+ return res;
}
}