Commit be1eb4bb authored by Christophe Massiot's avatar Christophe Massiot

* Using i_id instead of i_stream_id whenever possible ;

* Fixed a bug in -c and -s options.
parent 10dda32d
......@@ -2,7 +2,7 @@
* input_ext-dec.h: structures exported to the VideoLAN decoders
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_ext-dec.h,v 1.4 2000/12/21 19:24:26 massiot Exp $
* $Id: input_ext-dec.h,v 1.5 2000/12/22 17:53:30 massiot Exp $
*
* Authors:
*
......@@ -441,7 +441,7 @@ static __inline__ void GetChunk( bit_stream_t * p_bit_stream,
*****************************************************************************/
typedef struct decoder_config_s
{
u16 i_stream_id;
u16 i_id;
u8 i_type; /* type of the elementary stream */
struct stream_ctrl_s * p_stream_ctrl;
......
......@@ -3,7 +3,7 @@
* FIXME : check the return value of realloc() and malloc() !
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_programs.c,v 1.16 2000/12/22 15:34:24 massiot Exp $
* $Id: input_programs.c,v 1.17 2000/12/22 17:53:30 massiot Exp $
*
* Authors:
*
......@@ -390,7 +390,7 @@ void input_DumpStream( input_thread_t * p_input )
static int InitDecConfig( input_thread_t * p_input, es_descriptor_t * p_es,
decoder_config_t * p_config )
{
p_config->i_stream_id = p_es->i_stream_id;
p_config->i_id = p_es->i_id;
p_config->i_type = p_es->i_type;
p_config->p_stream_ctrl =
&p_input->stream.control;
......
......@@ -2,7 +2,7 @@
* mpeg_system.c: TS, PS and PES management
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: mpeg_system.c,v 1.17 2000/12/22 15:00:42 sam Exp $
* $Id: mpeg_system.c,v 1.18 2000/12/22 17:53:30 massiot Exp $
*
* Authors:
*
......@@ -753,7 +753,7 @@ es_descriptor_t * input_ParsePS( input_thread_t * p_input,
if( main_GetIntVariable( INPUT_DVD_AUDIO_VAR, 0 )
== REQUESTED_MPEG
&& main_GetIntVariable( INPUT_DVD_CHANNEL_VAR, 0 )
== (p_es->i_stream_id & 0x1F) )
== (p_es->i_id & 0x1F) )
{
input_SelectES( p_input, p_es );
}
......@@ -767,7 +767,7 @@ es_descriptor_t * input_ParsePS( input_thread_t * p_input,
if( main_GetIntVariable( INPUT_DVD_AUDIO_VAR, 0 )
== REQUESTED_AC3
&& main_GetIntVariable( INPUT_DVD_CHANNEL_VAR, 0 )
== ((p_es->i_stream_id & 0xF00) >> 8) )
== ((p_es->i_id & 0xF00) >> 8) )
{
input_SelectES( p_input, p_es );
}
......@@ -779,7 +779,7 @@ es_descriptor_t * input_ParsePS( input_thread_t * p_input,
p_es->i_type = DVD_SPU_ES;
#ifdef AUTO_SPAWN
if( main_GetIntVariable( INPUT_DVD_SUBTITLE_VAR, 0 )
== ((p_es->i_stream_id & 0x1F00) >> 8) )
== ((p_es->i_id & 0x1F00) >> 8) )
{
input_SelectES( p_input, p_es );
}
......
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