[vlc-commits] commit: stream_filter/httplive.c: cleanup parse_StreamInformation() ( Jean-Paul Saman )

[git at videolan.org]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Tue Dec 28 12:52:01 2010 +0100| [37164e21de04929d633961c515328cd38e6a29a2] | committer: Jean-Paul Saman 

stream_filter/httplive.c: cleanup parse_StreamInformation()

Cleanup parse_StreamInformation() function.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=37164e21de04929d633961c515328cd38e6a29a2
---

 modules/stream_filter/httplive.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 9a9ab05..1402acd 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -404,7 +404,8 @@ static void parse_TargetDuration(stream_t *s, hls_stream_t *hls, char *p_read)
     hls->duration = duration; /* seconds */
 }
 
-static void parse_StreamInformation(stream_t *s, char *p_read, char *uri)
+static void parse_StreamInformation(stream_t *s, vlc_array_t **hls_stream,
+                                    char *p_read, char *uri)
 {
     stream_sys_t *p_sys = s->p_sys;
 
@@ -444,7 +445,7 @@ static void parse_StreamInformation(stream_t *s, char *p_read, char *uri)
     char *psz_uri = NULL;
     psz_uri = relative_URI(s, uri, psz_uri);
 
-    hls_stream_t *hls = hls_New(p_sys->hls_stream, id, bw, psz_uri ? psz_uri : uri);
+    hls_stream_t *hls = hls_New(*hls_stream, id, bw, psz_uri ? psz_uri : uri);
     if (hls == NULL)
         p_sys->b_error = true;
 
@@ -730,7 +731,7 @@ static int parse_HTTPLiveStreaming(stream_t *s)
                 p_sys->b_error = true;
             else
             {
-                parse_StreamInformation(s, p_read, uri);
+                parse_StreamInformation(s, &p_sys->hls_stream, p_read, uri);
                 free(uri);
             }
         }