projects
/
platform
/
upstream
/
gst-plugins-bad.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ea27fe3
)
hlsdemux: abort playlist update when cancelled
author
Arnaud Vrac
<avrac@freebox.fr>
Thu, 16 Jul 2015 20:57:36 +0000
(22:57 +0200)
committer
Sebastian Dröge
<sebastian@centricular.com>
Wed, 19 Aug 2015 13:22:44 +0000
(16:22 +0300)
Otherwise the download thread will get stuck, since the downloader is
disabled.
ext/hls/gsthlsdemux.c
patch
|
blob
|
history
diff --git
a/ext/hls/gsthlsdemux.c
b/ext/hls/gsthlsdemux.c
index 0f649b2c6b22fb70a21c290788a2ca568d7c255b..eb238e1b21a4f9722d2c8044e6652c271df1aca7 100644
(file)
--- a/
ext/hls/gsthlsdemux.c
+++ b/
ext/hls/gsthlsdemux.c
@@
-858,7
+858,7
@@
retry:
TRUE, TRUE, TRUE, err);
g_free (main_uri);
if (download == NULL) {
- if (update && !main_checked
+ if (
!adaptive_demux->cancelled &&
update && !main_checked
&& gst_m3u8_client_has_variant_playlist (demux->client)
&& gst_m3u8_client_has_main (demux->client)) {
GError *err2 = NULL;