diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2015-09-16 23:38:24 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2015-10-02 11:01:10 +0300 |
commit | 1df82cddeb1e67b842d84266637b6cd0cf4dadef (patch) | |
tree | 362226b249bd1abd21d41ddea5c856a732e0bff9 /ext | |
parent | d676c7e9bf8504746a1952ae772480c90022fab8 (diff) | |
download | gstreamer-plugins-bad-1df82cddeb1e67b842d84266637b6cd0cf4dadef.tar.gz |
dashdemux: Properly handle relative and non-HTTP URIs for the headers/indices
gst_uri_join_strings() will return the second parameter if it is an absolute
URI. No need to do a (wrong) check if the URI is absolute or not beforehand.
https://bugzilla.gnome.org/show_bug.cgi?id=755134
Diffstat (limited to 'ext')
-rw-r--r-- | ext/dash/gstdashdemux.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ext/dash/gstdashdemux.c b/ext/dash/gstdashdemux.c index f1b30917e..ae349d170 100644 --- a/ext/dash/gstdashdemux.c +++ b/ext/dash/gstdashdemux.c @@ -911,27 +911,23 @@ gst_dash_demux_stream_update_headers_info (GstAdaptiveDemuxStream * stream) &path, dashstream->index, &stream->fragment.header_range_start, &stream->fragment.header_range_end); - if (path != NULL && strncmp (path, "http://", 7) != 0) { + if (path != NULL) { stream->fragment.header_uri = gst_uri_join_strings (gst_mpdparser_get_baseURL (dashdemux->client, dashstream->index), path); g_free (path); - } else { - stream->fragment.header_uri = path; + path = NULL; } - path = NULL; gst_mpd_client_get_next_header_index (dashdemux->client, &path, dashstream->index, &stream->fragment.index_range_start, &stream->fragment.index_range_end); - if (path != NULL && strncmp (path, "http://", 7) != 0) { + if (path != NULL) { stream->fragment.index_uri = gst_uri_join_strings (gst_mpdparser_get_baseURL (dashdemux->client, dashstream->index), path); g_free (path); - } else { - stream->fragment.index_uri = path; } } |