]> git.sesse.net Git - vlc/commitdiff
Enabled again timeout for win32 in live555.
authorLaurent Aimar <fenrir@videolan.org>
Fri, 17 Apr 2009 19:23:25 +0000 (21:23 +0200)
committerLaurent Aimar <fenrir@videolan.org>
Mon, 20 Apr 2009 18:32:28 +0000 (20:32 +0200)
modules/demux/live555.cpp

index c3d33754a03ec3d985404fecef4e497542346d52..d2af92e09a9038b678ec43d88f6e4e84aec6b26c 100644 (file)
@@ -541,12 +541,8 @@ describe:
     authenticator.setUsernameAndPassword( (const char*)psz_user,
                                           (const char*)psz_pwd );
 
-#if defined(WIN32)
-#   warning "Disabled live555 timeout because of buggy library"
-    const int i_timeout = 0;
-#else
+    /* */
     const int i_timeout = var_CreateGetInteger(p_demux, "ipv4-timeout") / 1000;
-#endif
 
 #if LIVEMEDIA_LIBRARY_VERSION_INT >= 1223337600
     psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,