Merge branch 'hls' of git.m2x.eu:vlc into hls

include/vlc_fs.h

@@ -46,6 +46,15 @@ VLC_EXPORT( int, vlc_rename, ( const char *oldpath, const char *newpath ) );
 
 #if defined( WIN32 ) && !defined( UNDER_CE )
 # define stat _stati64
+
+static inline void vlc_rewinddir( DIR *dir )
+{
+    _WDIR *wdir = *(_WDIR **)dir;
+
+    _wrewinddir( wdir );
+}
+# undef rewinddir
+# define rewinddir vlc_rewinddir
 #endif
 
 VLC_EXPORT( int, vlc_stat, ( const char *filename, struct stat *buf ) );

modules/stream_filter/httplive.c

@@ -923,12 +923,8 @@ static void* hls_Thread(vlc_object_t *p_this)
 static int Prefetch(stream_t *s, int *current)
 {
     stream_sys_t *p_sys = s->p_sys;
-    int current;
 
-again:
-    current = p_sys->current;
-
-    hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->current);
+    hls_stream_t *hls = hls_Get(p_sys->hls_stream, current);
     if (hls == NULL)
         return VLC_EGENERIC;
 
@@ -939,10 +935,6 @@ again:
     if (Download(s, hls, segment, current) != VLC_SUCCESS)
         return VLC_EGENERIC;
 
-    /* Bandwidth changed? */
-    if (current != p_sys->current)
-        goto again;
-
     return VLC_SUCCESS;
 }