* input_ps.c: PS demux and packet management
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ps.c,v 1.8 2001/02/20 07:49:13 sam Exp $
+ * $Id: input_ps.c,v 1.11 2001/03/15 01:42:20 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
}
/* File too big. */
- if( p_input->stream.pp_areas[0]->i_tell > INPUT_PREPARSE_LENGTH )
+ if( p_input->stream.p_selected_area->i_tell >
+ INPUT_PREPARSE_LENGTH )
{
break;
}
}
rewind( p_method->stream );
vlc_mutex_lock( &p_input->stream.stream_lock );
- p_input->stream.pp_areas[0]->i_tell = 0;
+ p_input->stream.p_selected_area->i_tell = 0;
if( p_demux_data->b_has_PSM )
{
/* (The PSM decoder will care about spawning the decoders) */
*****************************************************************************/
static void PSEnd( input_thread_t * p_input )
{
- free( p_input->stream.p_demux_data );
free( p_input->p_plugin_data );
}
}
}
vlc_mutex_lock( &p_input->stream.stream_lock );
- p_input->stream.pp_areas[0]->i_tell += i_len;
+ p_input->stream.p_selected_area->i_tell += i_len;
vlc_mutex_unlock( &p_input->stream.stream_lock );
return( 0 );
}
/* It is common for MPEG-1 streams to pad with zeros
* (although it is forbidden by the recommendation), so
* don't bother everybody in this case. */
- intf_WarnMsg( 1, "Garbage at input (%x)", i_startcode );
+ intf_WarnMsg( 1, "Garbage at input (%.8x)", i_startcode );
}
while( (i_startcode & 0xFFFFFF00) != 0x100L )
/* A little bourrin but should work for a while --Meuuh */
fseeko( p_method->stream, i_position, SEEK_SET );
- p_input->stream.pp_areas[0]->i_tell = i_position;
+ p_input->stream.p_selected_area->i_tell = i_position;
}
/*