From: Derk-Jan Hartman <hartman@videolan.org>
Date: Sat, 12 Aug 2006 14:24:54 +0000 (+0000)
Subject: * fix the getlength. It needs to be after the SETUP, so that liveMedia can correct... 
X-Git-Tag: 0.9.0-test0~10660
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7f01046284c11de3393f7ac801e8ae97d3617a40;p=vlc

* fix the getlength. It needs to be after the SETUP, so that liveMedia can correct Windows Media Servers.
---

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 07bd7b00e1..3be874be48 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -351,17 +351,17 @@ static int  Open ( vlc_object_t *p_this )
         goto error;
     }
     
-    /* Retrieve the duration if possible */
-    p_sys->i_length = (int64_t)( p_sys->ms->playEndTime() * 1000000.0 );
-    if( p_sys->i_length < 0 )
-        p_sys->i_length = -1;
-
     if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS )
     {
         msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path );
         goto error;
     }
-    
+
+    /* Retrieve the duration if possible */
+    p_sys->i_length = (int64_t)( p_sys->ms->playEndTime() * 1000000.0 );
+    if( p_sys->i_length < 0 )
+        p_sys->i_length = -1;
+
     if( ( i_return = Play( p_demux ) ) != VLC_SUCCESS )
         goto error;
     
@@ -1243,18 +1243,18 @@ static int RollOverTcp( demux_t *p_demux )
             p_sys->env->getResultMsg() );
         goto error;
     }
-    
-    /* Retrieve the duration if possible */
-    p_sys->i_length = (int64_t)( p_sys->ms->playEndTime() * 1000000.0 );
-    if( p_sys->i_length < 0 )
-        p_sys->i_length = -1;
 
     if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS )
     {
         msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path );
         goto error;
     }
-    
+
+    /* Retrieve the duration if possible */
+    p_sys->i_length = (int64_t)( p_sys->ms->playEndTime() * 1000000.0 );
+    if( p_sys->i_length < 0 )
+        p_sys->i_length = -1;
+
     if( ( i_return = Play( p_demux ) ) != VLC_SUCCESS )
         goto error;