projects
/
platform
/
upstream
/
gst-plugins-good.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
afcd462
)
avidemux: Stop without posting error on flushing
author
Olivier Crête
<olivier.crete@ocrete.ca>
Sat, 25 Jul 2015 07:25:28 +0000
(
03:25
-0400)
committer
Olivier Crête
<olivier.crete@ocrete.ca>
Sat, 25 Jul 2015 07:25:28 +0000
(
03:25
-0400)
This could just be a normal pipeline shutdown.
gst/avi/gstavidemux.c
patch
|
blob
|
history
diff --git
a/gst/avi/gstavidemux.c
b/gst/avi/gstavidemux.c
index
f2bebaf
..
56916e7
100644
(file)
--- 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
;
}
}