]> git.sesse.net Git - vlc/commitdiff
* We can now seek at position 0 :p ;
authorChristophe Massiot <massiot@videolan.org>
Mon, 12 Feb 2001 13:20:15 +0000 (13:20 +0000)
committerChristophe Massiot <massiot@videolan.org>
Mon, 12 Feb 2001 13:20:15 +0000 (13:20 +0000)
* Fixed a typo in my previous commit.

include/input.h
src/input/input.c
src/video_parser/vpar_synchro.c

index ae138b2598887d6ba077c40f09068881dfeddabd..60e42c15c28884f2aa20b65f65146de926ae2204 100644 (file)
@@ -2,7 +2,7 @@
  * input.h: structures of the input not exported to other modules
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input.h,v 1.28 2001/02/08 17:44:12 massiot Exp $
+ * $Id: input.h,v 1.29 2001/02/12 13:20:14 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -34,6 +34,7 @@
                                  * of data loss (this should be < 188).      */
 #define PADDING_PACKET_NUMBER 10 /* Number of padding packets top insert to
                                   * escape a decoder.                        */
+#define NO_SEEK             -1
 
 /*****************************************************************************
  * Prototypes from input_ext-dec.c
index 43bff2eed1ce2ca71071bd105b0e53877f3a9fb0..603ff55925b6addb1b1fc1542245f1cf18a8d504 100644 (file)
@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input.c,v 1.79 2001/02/11 01:15:11 sam Exp $
+ * $Id: input.c,v 1.80 2001/02/12 13:20:14 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -105,7 +105,7 @@ input_thread_t *input_CreateThread ( playlist_item_t *p_item, int *pi_status )
     p_input->stream.i_selected_es_number = 0;
     p_input->stream.i_pgrm_number = 0;
     p_input->stream.i_new_status = p_input->stream.i_new_rate = 0;
-    p_input->stream.i_seek = 0;
+    p_input->stream.i_seek = NO_SEEK;
 
     /* Initialize stream control properties. */
     p_input->stream.control.i_status = PLAYING_S;
@@ -198,7 +198,7 @@ static void RunThread( input_thread_t *p_input )
 #endif
 
         vlc_mutex_lock( &p_input->stream.stream_lock );
-        if( p_input->stream.i_seek )
+        if( p_input->stream.i_seek != NO_SEEK )
         {
             if( p_input->stream.b_seekable && p_input->pf_seek != NULL )
             {
@@ -216,7 +216,7 @@ static void RunThread( input_thread_t *p_input )
                     p_pgrm->i_synchro_state = SYNCHRO_REINIT;
                 }
             }
-            p_input->stream.i_seek = 0;
+            p_input->stream.i_seek = NO_SEEK;
         }
         vlc_mutex_unlock( &p_input->stream.stream_lock );
 
index 6b78c4519a1eda0d09075b6ff3e8654a4b85f766..3f68a0dbc72c52aa024dde4b8d0627f991ba6bf4 100644 (file)
@@ -2,7 +2,7 @@
  * vpar_synchro.c : frame dropping routines
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: vpar_synchro.c,v 1.83 2001/02/12 11:22:31 massiot Exp $
+ * $Id: vpar_synchro.c,v 1.84 2001/02/12 13:20:15 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -583,7 +583,7 @@ void vpar_SynchroNewPicture( vpar_thread_t * p_vpar, int i_coding_type,
     if( p_vpar->synchro.backward_pts + DEFAULT_PTS_DELAY < now )
     {
         /* The same. */
-        p_vpar->synchro.current_pts = 0;
+        p_vpar->synchro.backward_pts = 0;
     }
 
 #ifdef STATS