]> git.sesse.net Git - vlc/commitdiff
Updated the length in rtsp on PLAY request only if defined.
authorLaurent Aimar <fenrir@videolan.org>
Thu, 9 Jul 2009 19:52:03 +0000 (21:52 +0200)
committerLaurent Aimar <fenrir@videolan.org>
Thu, 9 Jul 2009 19:53:36 +0000 (21:53 +0200)
It will fix interoperability with live555 server.

modules/demux/live555.cpp

index 23160c3639909bb797b104f0962f39d66bfbc7b2..7a1cd661541e380654bdd32a941d5382cb5cba77 100644 (file)
@@ -1078,7 +1078,8 @@ static int Play( demux_t *p_demux )
 
     /* Retrieve the starttime if possible */
     p_sys->i_npt_start = p_sys->ms->playStartTime();
-    p_sys->i_npt_length = p_sys->ms->playEndTime();
+    if( p_sys->ms->playEndTime() > 0 )
+        p_sys->i_npt_length = p_sys->ms->playEndTime();
 
     msg_Dbg( p_demux, "play start: %f stop:%f", p_sys->i_npt_start, p_sys->i_npt_length );
     return VLC_SUCCESS;
@@ -1286,7 +1287,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                 p_sys->i_npt = p_sys->i_npt_start = p_sys->ms->playStartTime();
 
                 /* Retrieve the duration if possible */
-                p_sys->i_npt_length = p_sys->ms->playEndTime();
+                if( p_sys->ms->playEndTime() > 0 )
+                    p_sys->i_npt_length = p_sys->ms->playEndTime();
 
                 msg_Dbg( p_demux, "seek start: %f stop:%f", p_sys->i_npt_start, p_sys->i_npt_length );
                 return VLC_SUCCESS;
@@ -1421,7 +1423,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             p_sys->i_npt_start = p_sys->ms->playStartTime();
 
             /* Retrieve the duration if possible */
-            p_sys->i_npt_length = p_sys->ms->playEndTime();
+            if( p_sys->ms->playEndTime() )
+                p_sys->i_npt_length = p_sys->ms->playEndTime();
 
             msg_Dbg( p_demux, "pause start: %f stop:%f", p_sys->i_npt_start, p_sys->i_npt_length );
             return VLC_SUCCESS;