* Remove crud

diff --git a/modules/demux/util/sub.h b/modules/demux/util/sub.h
index 513116887ca640729d5bb2d6b2c5fa50e16f6aef..5fecc11f63db9d2aaf41cc30ac62b7a20b40eda8 100644 (file)
--- a/modules/demux/util/sub.h
+++ b/modules/demux/util/sub.h
@@ -2,7 +2,7 @@
  * sub.h
  *****************************************************************************
  * Copyright (C) 2001-2004 VideoLAN
- * $Id: sub.h,v 1.15 2004/01/26 22:32:51 hartman Exp $
+ * $Id: sub.h,v 1.16 2004/01/26 22:42:50 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -49,8 +49,7 @@ typedef struct subtitle_demux_s
     int     (*pf_open) ( struct subtitle_demux_s *p_sub,
                          input_thread_t*p_input,
                          char *psz_name,
-                         mtime_t i_microsecperframe,
-                         int i_track_id );
+                         mtime_t i_microsecperframe );
     int     (*pf_demux)( struct subtitle_demux_s *p_sub, mtime_t i_maxdate );
     int     (*pf_seek) ( struct subtitle_demux_s *p_sub, mtime_t i_date );
     void    (*pf_close)( struct subtitle_demux_s *p_sub );

diff --git a/src/input/input.c b/src/input/input.c
index e4eb3d7f6520a70b5428a603f5af365f9550216f..9ff77cafe78464443bbad25b5cec60cf16f1af9c 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998-2004 VideoLAN
- * $Id: input.c,v 1.280 2004/01/26 20:48:10 fenrir Exp $
+ * $Id: input.c,v 1.281 2004/01/26 22:42:50 hartman Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -820,7 +820,7 @@ static int InitThread( input_thread_t * p_input )
     {
         subtitle_demux_t *p_sub;
         if( ( p_sub = subtitle_New( p_input, strdup(val.psz_string),
-                                    i_microsecondperframe, 0 ) ) )
+                                    i_microsecondperframe ) ) )
         {
             p_sub_toselect = p_sub;
             TAB_APPEND( p_input->p_sys->i_sub, p_input->p_sys->sub, p_sub );
@@ -838,7 +838,7 @@ static int InitThread( input_thread_t * p_input )
         for( i = 0; *tmp2 != NULL; i++ )
         {
             if( ( p_sub = subtitle_New( p_input, *tmp2,
-                                        i_microsecondperframe, i ) ) )
+                                        i_microsecondperframe ) ) )
             {
                 TAB_APPEND( p_input->p_sys->i_sub, p_input->p_sys->sub, p_sub );
             }