. fixed default subtitle stream handling (default: no subtitles)

 . added a few missing break;s
 (oui je sais je ne fais que des patches de deux lignes � trois balles,
  mais par telnet c'est pas facile)

diff --git a/src/input/input_ps.c b/src/input/input_ps.c
index fdcc0c59035de5c8db7021c0fa88cb223c143bf1..83b6c844849ac07e67a39aa9a876bae69bd52092 100644 (file)
--- a/src/input/input_ps.c
+++ b/src/input/input_ps.c
@@ -2,7 +2,7 @@
  * input_ps.c: PS demux and packet management
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ps.c,v 1.16 2000/12/28 17:57:39 massiot Exp $
+ * $Id: input_ps.c,v 1.17 2000/12/29 14:04:59 sam Exp $
  *
  * Authors: 
  *
@@ -197,16 +197,19 @@ static void PSInit( input_thread_t * p_input )
                         {
                             input_SelectES( p_input, p_es );
                         }
+                        break;
 
                     case DVD_SPU_ES:
-                        if( main_GetIntVariable( INPUT_DVD_SUBTITLE_VAR, 0 )
+                        if( main_GetIntVariable( INPUT_DVD_SUBTITLE_VAR, -1 )
                                 == ((p_es->i_id & 0x1F00) >> 8) )
                         {
                             input_SelectES( p_input, p_es );
                         }
+                        break;
 
                     case LPCM_AUDIO_ES:
                         /* FIXME ! */
+                        break;
                 }
             }
                     

diff --git a/src/input/mpeg_system.c b/src/input/mpeg_system.c
index e825fa13a5efe0170ca1acd4bfa5f396fa424300..0d3c81976b9638adc6c073eb192a3912a049a503 100644 (file)
--- a/src/input/mpeg_system.c
+++ b/src/input/mpeg_system.c
@@ -2,7 +2,7 @@
  * mpeg_system.c: TS, PS and PES management
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: mpeg_system.c,v 1.22 2000/12/29 10:52:40 massiot Exp $
+ * $Id: mpeg_system.c,v 1.23 2000/12/29 14:04:59 sam Exp $
  *
  * Authors: 
  *
@@ -926,7 +926,7 @@ es_descriptor_t * input_ParsePS( input_thread_t * p_input,
                         /* Subtitles video (0x20->0x3F) */
                         p_es->i_type = DVD_SPU_ES;
 #ifdef AUTO_SPAWN
-                        if( main_GetIntVariable( INPUT_DVD_SUBTITLE_VAR, 0 )
+                        if( main_GetIntVariable( INPUT_DVD_SUBTITLE_VAR, -1 )
                                 == ((p_es->i_id & 0x1F00) >> 8) )
                         {
                             if( !p_input->stream.b_seekable )