* ./extras/MacOSX_dvdioctl: removed outdated files.

[vlc] / plugins / dvdread / input_dvdread.c

diff --git a/plugins/dvdread/input_dvdread.c b/plugins/dvdread/input_dvdread.c
index 984bb1a6925d48f8da9078102b5dc89029629b3b..883cdce64c5724fd887bd7b8651f2468e370edf0 100644 (file)
--- a/plugins/dvdread/input_dvdread.c
+++ b/plugins/dvdread/input_dvdread.c
@@ -6,7 +6,7 @@
  * It depends on: libdvdread for ifo files and block reading.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: input_dvdread.c,v 1.32 2002/03/11 07:23:09 gbazin Exp $
+ * $Id: input_dvdread.c,v 1.34 2002/03/18 19:14:52 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -131,6 +131,11 @@ void _M( demux_getfunctions )( function_list_t * p_function_list )
  *****************************************************************************/
 static int DvdReadInit( input_thread_t * p_input )
 {
+    if( p_input->stream.i_method != INPUT_METHOD_DVD )
+    {
+        return -1;
+    }
+
     vlc_mutex_lock( &p_input->stream.stream_lock );
     
     DvdReadLauchDecoders( p_input );
@@ -1216,9 +1221,7 @@ static void DvdReadLauchDecoders( input_thread_t * p_input )
         }
         if( i_audio > 0/* && i_audio_nb > 0*/ )
         {
-            if( config_GetIntVariable( "spdif" ) ||
-                ( config_GetIntVariable( "input_audio" ) ==
-                  REQUESTED_AC3 ) )
+            if( config_GetIntVariable( "input_audio" ) == REQUESTED_AC3 )
             {
                 int     i_ac3 = i_audio;
                 while( ( p_input->stream.pp_es[i_ac3]->i_type !=