Commit f14ae4a2 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Remove crud

parent 8f2d732d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* sub.h * sub.h
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2004 VideoLAN * 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> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -49,8 +49,7 @@ typedef struct subtitle_demux_s ...@@ -49,8 +49,7 @@ typedef struct subtitle_demux_s
int (*pf_open) ( struct subtitle_demux_s *p_sub, int (*pf_open) ( struct subtitle_demux_s *p_sub,
input_thread_t*p_input, input_thread_t*p_input,
char *psz_name, char *psz_name,
mtime_t i_microsecperframe, mtime_t i_microsecperframe );
int i_track_id );
int (*pf_demux)( struct subtitle_demux_s *p_sub, mtime_t i_maxdate ); 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 ); int (*pf_seek) ( struct subtitle_demux_s *p_sub, mtime_t i_date );
void (*pf_close)( struct subtitle_demux_s *p_sub ); void (*pf_close)( struct subtitle_demux_s *p_sub );
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* decoders. * decoders.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2004 VideoLAN * 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> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -820,7 +820,7 @@ static int InitThread( input_thread_t * p_input ) ...@@ -820,7 +820,7 @@ static int InitThread( input_thread_t * p_input )
{ {
subtitle_demux_t *p_sub; subtitle_demux_t *p_sub;
if( ( p_sub = subtitle_New( p_input, strdup(val.psz_string), if( ( p_sub = subtitle_New( p_input, strdup(val.psz_string),
i_microsecondperframe, 0 ) ) ) i_microsecondperframe ) ) )
{ {
p_sub_toselect = p_sub; p_sub_toselect = p_sub;
TAB_APPEND( p_input->p_sys->i_sub, p_input->p_sys->sub, 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 ) ...@@ -838,7 +838,7 @@ static int InitThread( input_thread_t * p_input )
for( i = 0; *tmp2 != NULL; i++ ) for( i = 0; *tmp2 != NULL; i++ )
{ {
if( ( p_sub = subtitle_New( p_input, *tmp2, 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 ); TAB_APPEND( p_input->p_sys->i_sub, p_input->p_sys->sub, p_sub );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment