summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYouness Alaoui <youness.alaoui@collabora.co.uk>2011-08-25 23:37:25 +0000
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2011-08-26 09:51:46 +0200
commit015d1e11e211c18825856285d22d9b8e5bb5390d (patch)
tree2ce57be03e18d93f1c8af0879a83f1682c339e7b
parentd69297a23c955d01516cb9ed7e707697b7a98083 (diff)
hlsdemux: do not post an error if we seek/cancel during caching of fragments
-rw-r--r--gst/hls/gsthlsdemux.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c
index d588ed970..582507ab5 100644
--- a/gst/hls/gsthlsdemux.c
+++ b/gst/hls/gsthlsdemux.c
@@ -751,9 +751,11 @@ end_of_playlist:
cache_error:
{
- GST_ELEMENT_ERROR (demux, RESOURCE, NOT_FOUND,
- ("Could not cache the first fragments"), (NULL));
- gst_hls_demux_stop (demux);
+ if (!demux->cancelled) {
+ GST_ELEMENT_ERROR (demux, RESOURCE, NOT_FOUND,
+ ("Could not cache the first fragments"), (NULL));
+ gst_hls_demux_stop (demux);
+ }
return;
}