[vlc-commits] hls: Fixing playlist updating.

Hugo Beauzée-Luyssen git at videolan.org
Tue Jan 24 19:31:59 CET 2012


vlc/vlc-1.2 | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Tue Jan 24 15:11:04 2012 +0100| [7bafd5e57a078b318e2805a69fc5e4931e86ccc9] | committer: Jean-Baptiste Kempf

hls: Fixing playlist updating.

parse_M3U8 uses hls_GetLast to update the HLS current hls stream, so we
have to add it to the streams array before calling parse_M3U8

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit e06362372ebb2e7d2a0ce0924703717807fb73ed)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=7bafd5e57a078b318e2805a69fc5e4931e86ccc9
---

 modules/stream_filter/httplive.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 3c52b83..d6b3fe1 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1326,21 +1326,11 @@ static int get_HTTPLiveMetaPlaylist(stream_t *s, vlc_array_t **streams)
         dst = hls_Copy(src, false);
         if (dst == NULL)
             return VLC_ENOMEM;
-
         vlc_array_append(*streams, dst);
-    }
-
-    /* Download new playlist file from server */
-    for (int i = 0; i < vlc_array_count(*streams); i++)
-    {
-        hls_stream_t *hls;
-        hls = (hls_stream_t *)vlc_array_item_at_index(*streams, i);
-        if (hls == NULL)
-            return VLC_EGENERIC;
 
         /* Download playlist file from server */
         uint8_t *buf = NULL;
-        ssize_t len = read_M3U8_from_url(s, &hls->url, &buf);
+        ssize_t len = read_M3U8_from_url(s, &dst->url, &buf);
         if (len < 0)
             err = VLC_EGENERIC;
         else



More information about the vlc-commits mailing list