live555: Mark --rtsp-tcp as safe.

[vlc] / modules / demux / live555.cpp

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index c3d33754a03ec3d985404fecef4e497542346d52..fbbad33e91820735fe13d2fad54f99f9dfe11097 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -103,11 +103,14 @@ vlc_module_begin ()
         set_description( N_("RTSP/RTP access and demux") )
         add_shortcut( "rtsp" )
         add_shortcut( "sdp" )
+        add_shortcut( "live" )
+        add_shortcut( "livedotcom" )
         set_capability( "access_demux", 0 )
         set_callbacks( Open, Close )
         add_bool( "rtsp-tcp", 0, NULL,
                   N_("Use RTP over RTSP (TCP)"),
                   N_("Use RTP over RTSP (TCP)"), true )
+            change_safe()
         add_integer( "rtp-client-port", -1, NULL,
                   N_("Client port"),
                   N_("Port to use for the RTP source of the session"), true )
@@ -123,6 +126,7 @@ vlc_module_begin ()
                   true )
         add_integer("rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
                     CACHING_TEXT, CACHING_LONGTEXT, true )
+            change_safe()
         add_bool(   "rtsp-kasenna", false, NULL, KASENNA_TEXT,
                     KASENNA_LONGTEXT, true )
         add_string( "rtsp-user", NULL, NULL, USER_TEXT,
@@ -541,12 +545,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,
@@ -1428,7 +1428,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             }
 
             /* Retrieve the starttime if possible */
-            p_sys->i_npt = p_sys->i_npt_start = p_sys->ms->playStartTime();
+            p_sys->i_npt_start = p_sys->ms->playStartTime();
 
             /* Retrieve the duration if possible */
             p_sys->i_npt_length = p_sys->ms->playEndTime();