Mercurial > mplayer.hg

changeset 31804:7d7c7d772b52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix DVD playback with region-free drives.
author reimar
date Sun, 01 Aug 2010 12:48:38 +0000
parents 53145096892e
children 05ca6dd36faf
files libdvdcss/css.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libdvdcss/css.c	Sat Jul 31 22:15:49 2010 +0000
+++ b/libdvdcss/css.c	Sun Aug 01 12:48:38 2010 +0000
@@ -94,7 +94,6 @@
  *   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 @@
     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 )