mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Don't set base URI if there was no redirect

Browse source
This commit is contained in:
Sebastian Dröge 2014-05-28 12:44:38 +02:00
parent 5ca7684b7d
commit 9cb3d745db
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/hls/gsthlsdemux.c
View file

@ -597,8 +597,8 @@ gst_hls_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
gst_query_parse_uri_redirection (query, &redirect_uri); gst_query_parse_uri_redirection (query, &redirect_uri);
gst_query_parse_uri_redirection_permanent (query, &permanent); gst_query_parse_uri_redirection_permanent (query, &permanent);
if (permanent) { if (permanent && redirect_uri) {
gst_hls_demux_set_location (demux, redirect_uri, redirect_uri); gst_hls_demux_set_location (demux, redirect_uri, NULL);
} else { } else {
gst_hls_demux_set_location (demux, uri, redirect_uri); gst_hls_demux_set_location (demux, uri, redirect_uri);
} }
@ -1504,7 +1504,7 @@ gst_hls_demux_update_playlist (GstHLSDemux * demux, gboolean update,
GST_M3U8_CLIENT_LOCK (demux->client); GST_M3U8_CLIENT_LOCK (demux->client);
g_free (demux->client->current->uri); g_free (demux->client->current->uri);
g_free (demux->client->current->base_uri); g_free (demux->client->current->base_uri);
if (download->redirect_permanent) { if (download->redirect_permanent && download->redirect_uri) {
demux->client->current->uri = g_strdup (download->redirect_uri); demux->client->current->uri = g_strdup (download->redirect_uri);
demux->client->current->base_uri = NULL; demux->client->current->base_uri = NULL;
} else { } else {