summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2015-11-29 01:02:15 +0000
committerTim-Philipp Müller <tim@centricular.com>2015-12-01 18:01:36 +0000
commit64adb1998db4ddc6b39f33f82a5fdbc370c4e772 (patch)
treef3aa1587466f4e375538c7932f46a58e78e51ebb /ext
parent97ea56e91c54a33a1c7237a93d92fff68ba98740 (diff)
downloadgstreamer-plugins-bad-64adb1998db4ddc6b39f33f82a5fdbc370c4e772.tar.gz
hlsdemux: fix crash when decryption key can't be downloaded
Happened with http://sslhls.m6tv.cdn.sfr.net/hls-live/livepkgr/_definst_/m6_hls_aes/m6_hls_aes_856.m3u8 if glib-networking was not installed (since key has https uri).
Diffstat (limited to 'ext')
-rw-r--r--ext/hls/gsthlsdemux.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c
index 0ab1a43b6..e0562a961 100644
--- a/ext/hls/gsthlsdemux.c
+++ b/ext/hls/gsthlsdemux.c
@@ -477,9 +477,12 @@ gst_hls_demux_start_fragment (GstAdaptiveDemux * demux,
return TRUE;
key_failed:
- /* TODO Raise this error to the user */
- GST_WARNING_OBJECT (demux, "Failed to decrypt data");
- return FALSE;
+ {
+ GST_ELEMENT_ERROR (demux, STREAM, DEMUX,
+ ("Couldn't retrieve key for decryption"), (NULL));
+ GST_WARNING_OBJECT (demux, "Failed to decrypt data");
+ return FALSE;
+ }
}
static GstFlowReturn