[vlc-devel] commit: Fix a bug introduced by 920692ff5d2d6b001e0f6ac7bda1978c9f7abd1f ( Antoine Lejeune )

git version control git at videolan.org
Fri Apr 25 17:34:06 CEST 2008


vlc | branch: master | Antoine Lejeune <phytos at videolan.org> | Thu Apr 24 14:02:35 2008 +0200| [d8ad1230481fc55ff1b9aa66449c818ed31cded6]

Fix a bug introduced by 920692ff5d2d6b001e0f6ac7bda1978c9f7abd1f

Signed-off-by: Christophe Mutricy <xtophe at videolan.org>

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

 src/input/input.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 0146d46..a6ddee4 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -929,6 +929,7 @@ static void StartTitle( input_thread_t * p_input )
     int i, i_delay;
     char *psz;
     char *psz_subtitle;
+    int64_t i_length;
 
     /* Start title/chapter */
 
@@ -952,6 +953,7 @@ static void StartTitle( input_thread_t * p_input )
     p_input->p->i_start = I64C(1000000) * var_GetInteger( p_input, "start-time" );
     p_input->p->i_stop  = I64C(1000000) * var_GetInteger( p_input, "stop-time" );
     p_input->p->i_run   = I64C(1000000) * var_GetInteger( p_input, "run-time" );
+    i_length = var_GetTime( p_input, "length" );
     if( p_input->p->i_run < 0 )
     {
         msg_Warn( p_input, "invalid run-time ignored" );
@@ -960,7 +962,7 @@ static void StartTitle( input_thread_t * p_input )
 
     if( p_input->p->i_start > 0 )
     {
-        if( p_input->p->i_start >= val.i_time )
+        if( p_input->p->i_start >= i_length )
         {
             msg_Warn( p_input, "invalid start-time ignored" );
         }




More information about the vlc-devel mailing list