Commit bf448d31 authored by Christophe Massiot's avatar Christophe Massiot

* modules/demux/mpeg/*: Fixed an uninitialized variable with TS streams

  (thanks gibalou !).
parent 9a5db9e2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* system.c: helper module for TS, PS and PES management * system.c: helper module for TS, PS and PES management
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2002 VideoLAN * Copyright (C) 1998-2002 VideoLAN
* $Id: system.c,v 1.8 2002/12/06 16:34:07 sam Exp $ * $Id: system.c,v 1.9 2003/02/04 11:07:45 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr> * Michel Lespinasse <walken@via.ecp.fr>
...@@ -187,7 +187,7 @@ static void ParsePES( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -187,7 +187,7 @@ static void ParsePES( input_thread_t * p_input, es_descriptor_t * p_es )
msg_Warn( p_input, "packet corrupted, PES sizes do not match" ); msg_Warn( p_input, "packet corrupted, PES sizes do not match" );
} }
switch( p_es->i_stream_id ) switch( p_header[3] )
{ {
case 0xBC: /* Program stream map */ case 0xBC: /* Program stream map */
case 0xBE: /* Padding */ case 0xBE: /* Padding */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* mpeg_ts.c : Transport Stream input module for vlc * mpeg_ts.c : Transport Stream input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: ts.c,v 1.14 2003/01/08 16:40:29 fenrir Exp $ * $Id: ts.c,v 1.15 2003/02/04 11:07:45 massiot Exp $
* *
* Authors: Henri Fallon <henri@via.ecp.fr> * Authors: Henri Fallon <henri@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr> * Johan Bilien <jobi@via.ecp.fr>
...@@ -631,11 +631,17 @@ static void TSDecodePMT( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -631,11 +631,17 @@ static void TSDecodePMT( input_thread_t * p_input, es_descriptor_t * p_es )
{ {
case MPEG1_VIDEO_ES: case MPEG1_VIDEO_ES:
case MPEG2_VIDEO_ES: case MPEG2_VIDEO_ES:
/* This isn't real, but we don't actually use
* it. */
p_new_es->i_stream_id = 0xE0;
p_new_es->i_fourcc = VLC_FOURCC('m','p','g','v'); p_new_es->i_fourcc = VLC_FOURCC('m','p','g','v');
p_new_es->i_cat = VIDEO_ES; p_new_es->i_cat = VIDEO_ES;
break; break;
case MPEG1_AUDIO_ES: case MPEG1_AUDIO_ES:
case MPEG2_AUDIO_ES: case MPEG2_AUDIO_ES:
/* This isn't real, but we don't actually use
* it. */
p_new_es->i_stream_id = 0xC0;
p_new_es->i_fourcc = VLC_FOURCC('m','p','g','a'); p_new_es->i_fourcc = VLC_FOURCC('m','p','g','a');
p_new_es->i_cat = AUDIO_ES; p_new_es->i_cat = AUDIO_ES;
break; break;
......
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