[vlc-devel] commit: Enabled again timeout for win32 in live555. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Fri Apr 17 21:23:25 2009 +0200| [76f11cb98457494021ac5e1177d561562eb73029] | committer: Laurent Aimar 

Enabled again timeout for win32 in live555.

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

 modules/demux/live555.cpp |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index c3d3375..d2af92e 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -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,