mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-30 12:49:40 +00:00
hlsdemux: Split playslist on \r\n not just \n
This commit is contained in:
parent
6e9eeb7678
commit
fc0fe37b10
1 changed files with 8 additions and 1 deletions
|
@ -230,6 +230,8 @@ gst_m3u8_update (GstM3U8 * self, gchar * data, gboolean * updated)
|
||||||
*end = '\0';
|
*end = '\0';
|
||||||
|
|
||||||
if (data[0] != '#') {
|
if (data[0] != '#') {
|
||||||
|
gchar *r;
|
||||||
|
|
||||||
if (duration < 0 && list == NULL) {
|
if (duration < 0 && list == NULL) {
|
||||||
GST_LOG ("%s: got line without EXTINF or EXTSTREAMINF, dropping", data);
|
GST_LOG ("%s: got line without EXTINF or EXTSTREAMINF, dropping", data);
|
||||||
goto next_line;
|
goto next_line;
|
||||||
|
@ -250,8 +252,13 @@ gst_m3u8_update (GstM3U8 * self, gchar * data, gboolean * updated)
|
||||||
*slash = '\0';
|
*slash = '\0';
|
||||||
data = g_strdup_printf ("%s/%s", self->uri, data);
|
data = g_strdup_printf ("%s/%s", self->uri, data);
|
||||||
*slash = '/';
|
*slash = '/';
|
||||||
} else
|
} else {
|
||||||
data = g_strdup (data);
|
data = g_strdup (data);
|
||||||
|
}
|
||||||
|
|
||||||
|
r = g_utf8_strchr (data, -1, '\r');
|
||||||
|
if (r)
|
||||||
|
*r = '\0';
|
||||||
|
|
||||||
if (list != NULL) {
|
if (list != NULL) {
|
||||||
if (g_list_find_custom (self->lists, data,
|
if (g_list_find_custom (self->lists, data,
|
||||||
|
|
Loading…
Reference in a new issue