From 21a35506636d09daa2367091762cc50ca65cf5a5 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 1 Aug 2010 12:48:38 +0000 Subject: dvdcss: Fix DVD playback with region-free drives git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31881 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libdvdcss/css.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libdvdcss') diff --git a/libdvdcss/css.c b/libdvdcss/css.c index 264f43a1a9..1a5ecd0da5 100644 --- a/libdvdcss/css.c +++ b/libdvdcss/css.c @@ -94,7 +94,6 @@ static int AttackPadding ( uint8_t const[], int, uint8_t * ); * 1: DVD is scrambled but can be read * 0: DVD is not scrambled and can be read * -1: could not get "copyright" information - * -2: could not get RPC information (reading the disc might be possible) * -3: drive is RPC-II, region is not set, and DVD is scrambled: the RPC * scheme will prevent us from reading the scrambled data *****************************************************************************/ @@ -139,7 +138,9 @@ int _dvdcss_test( dvdcss_t dvdcss ) if( i_ret < 0 ) { print_error( dvdcss, "css error: could not get RPC status" ); - return -2; + // do not return an error, the drive might be a region-free one + // and we definitely should not just fail for that case. + return i_copyright ? 1 : 0; } switch( i_rpc ) -- cgit v1.2.3