[vlc-commits] hls: Renaming Download to hls_DownloadSegmentData

[Luc Saillard]

vlc/vlc-1.2 | branch: master | Luc Saillard <luc.saillard at sfr.com> | Mon Jan 23 16:45:11 2012 +0100| [88adceecf5da9d8a0050a704a64ca33ef2d28342] | committer: Jean-Baptiste Kempf

hls: Renaming Download to hls_DownloadSegmentData

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

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

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

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

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 76e6093..c47cf69 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1514,7 +1514,7 @@ static int BandwidthAdaptation(stream_t *s, int progid, uint64_t *bandwidth)
     return candidate;
 }
 
-static int Download(stream_t *s, hls_stream_t *hls, segment_t *segment, int *cur_stream)
+static int hls_DownloadSegmentData(stream_t *s, hls_stream_t *hls, segment_t *segment, int *cur_stream)
 {
     stream_sys_t *p_sys = s->p_sys;
 
@@ -1634,7 +1634,7 @@ static void* hls_Thread(void *p_this)
         vlc_mutex_unlock(&hls->lock);
 
         if ((segment != NULL) &&
-            (Download(s, hls, segment, &p_sys->download.stream) != VLC_SUCCESS))
+            (hls_DownloadSegmentData(s, hls, segment, &p_sys->download.stream) != VLC_SUCCESS))
         {
             if (!vlc_object_alive(s)) break;
 
@@ -1733,7 +1733,7 @@ again:
     if (segment == NULL )
         return VLC_EGENERIC;
 
-    if (Download(s, hls, segment, current) != VLC_SUCCESS)
+    if (hls_DownloadSegmentData(s, hls, segment, current) != VLC_SUCCESS)
         return VLC_EGENERIC;
 
     /* Found better bandwidth match, try again */
@@ -1754,7 +1754,7 @@ again:
             continue;
         }
 
-        if (Download(s, hls, segment, current) != VLC_SUCCESS)
+        if (hls_DownloadSegmentData(s, hls, segment, current) != VLC_SUCCESS)
             return VLC_EGENERIC;
 
         p_sys->download.segment++;