diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-08-01 12:48:38 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:14:46 +0200 |
| commit | 21a35506636d09daa2367091762cc50ca65cf5a5 (patch) | |
| tree | 0f5a59e08b1a74b7149ef9c7123164c6d2f76bcd /libdvdcss | |
| parent | d1a3dd5cad0bc29e147e8f7508be28b0a3d840d1 (diff) | |
| download | mpv-21a35506636d09daa2367091762cc50ca65cf5a5.tar.bz2 mpv-21a35506636d09daa2367091762cc50ca65cf5a5.tar.xz | |
dvdcss: Fix DVD playback with region-free drives
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31881 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdvdcss')
| -rw-r--r-- | libdvdcss/css.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 ) |