Commit 79095d58 authored by Stéphane Borel's avatar Stéphane Borel

I hope you liked this bug: DVD demux was always used.

parent 54d2ed59
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dvd.c : DVD input module for vlc * dvd.c : DVD input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: dvd.c,v 1.25 2002/03/05 18:17:52 stef Exp $ * $Id: dvd.c,v 1.26 2002/03/06 16:39:36 stef Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -57,7 +57,7 @@ ADD_CATEGORY_HINT( "[dvd:][device][@raw_device][@[title][,[chapter][,angle]]]", ...@@ -57,7 +57,7 @@ ADD_CATEGORY_HINT( "[dvd:][device][@raw_device][@[title][,[chapter][,angle]]]",
MODULE_CONFIG_STOP MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
ADD_CAPABILITY( DEMUX, 200 ) ADD_CAPABILITY( DEMUX, 0 )
#ifndef WIN32 #ifndef WIN32
# ifdef GOD_DAMN_DMCA # ifdef GOD_DAMN_DMCA
SET_DESCRIPTION( "DVD input module, uses libdvdcss if present" ) SET_DESCRIPTION( "DVD input module, uses libdvdcss if present" )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dvdread.c : DvdRead input module for vlc * dvdread.c : DvdRead input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: dvdread.c,v 1.12 2002/03/04 01:53:56 stef Exp $ * $Id: dvdread.c,v 1.13 2002/03/06 16:39:37 stef Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -44,7 +44,7 @@ MODULE_CONFIG_STOP ...@@ -44,7 +44,7 @@ MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
SET_DESCRIPTION( "DVDRead input module" ) SET_DESCRIPTION( "DVDRead input module" )
ADD_CAPABILITY( DEMUX, 210 ) ADD_CAPABILITY( DEMUX, 0 )
ADD_CAPABILITY( ACCESS, 110 ) ADD_CAPABILITY( ACCESS, 110 )
ADD_SHORTCUT( "dvdread" ) ADD_SHORTCUT( "dvdread" )
MODULE_INIT_STOP MODULE_INIT_STOP
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* It depends on: libdvdread for ifo files and block reading. * It depends on: libdvdread for ifo files and block reading.
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: input_dvdread.c,v 1.30 2002/03/06 01:20:56 stef Exp $ * $Id: input_dvdread.c,v 1.31 2002/03/06 16:39:37 stef Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -131,11 +131,6 @@ void _M( demux_getfunctions )( function_list_t * p_function_list ) ...@@ -131,11 +131,6 @@ void _M( demux_getfunctions )( function_list_t * p_function_list )
*****************************************************************************/ *****************************************************************************/
static int DvdReadInit( input_thread_t * p_input ) static int DvdReadInit( input_thread_t * p_input )
{ {
if( strncmp( p_input->p_access_module->psz_name, "dvdread", 7 ) )
{
return -1;
}
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
DvdReadLauchDecoders( p_input ); DvdReadLauchDecoders( p_input );
...@@ -415,6 +410,8 @@ static int DvdReadOpen( struct input_thread_s *p_input ) ...@@ -415,6 +410,8 @@ static int DvdReadOpen( struct input_thread_s *p_input )
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
p_input->psz_demux = "dvdread";
return 0; return 0;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vcd.c : VCD input module for vlc * vcd.c : VCD input module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000 VideoLAN * Copyright (C) 2000 VideoLAN
* $Id: vcd.c,v 1.7 2002/03/06 01:20:56 stef Exp $ * $Id: vcd.c,v 1.8 2002/03/06 16:39:37 stef Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -43,7 +43,7 @@ MODULE_CONFIG_STOP ...@@ -43,7 +43,7 @@ MODULE_CONFIG_STOP
MODULE_INIT_START MODULE_INIT_START
SET_DESCRIPTION( "VCD input module" ) SET_DESCRIPTION( "VCD input module" )
ADD_CAPABILITY( DEMUX, 180 ) ADD_CAPABILITY( DEMUX, 0 )
ADD_CAPABILITY( ACCESS, 80 ) ADD_CAPABILITY( ACCESS, 80 )
ADD_SHORTCUT( "vcd" ) ADD_SHORTCUT( "vcd" )
MODULE_INIT_STOP MODULE_INIT_STOP
......
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