[MPlayer-cvslog] r31319 - in trunk/libdvdcss: css.c libdvdcss.c

[reimar]

Author: reimar
Date: Sat Jun  5 08:41:43 2010
New Revision: 31319

Log:
Sync libdvdcss with their latest SVN.
In particular fixes a wring return value check which caused descrambling
to be aborted for no good reason.

Modified:
   trunk/libdvdcss/css.c
   trunk/libdvdcss/libdvdcss.c

Modified: trunk/libdvdcss/css.c
==============================================================================
--- trunk/libdvdcss/css.c	Sat Jun  5 08:28:58 2010	(r31318)
+++ trunk/libdvdcss/css.c	Sat Jun  5 08:41:43 2010	(r31319)
@@ -158,7 +158,7 @@ int _dvdcss_test( dvdcss_t dvdcss )
         default: psz_type = "unknown status"; break;
     }
 
-    print_debug( dvdcss, "drive region mask %x, %s, %s",
+    print_debug( dvdcss, "drive region mask 0x%x, %s, %s",
                          i_mask, psz_rpc, psz_type );
 
     if( i_copyright && i_rpc == 1 && i_type == 0 )

Modified: trunk/libdvdcss/libdvdcss.c
==============================================================================
--- trunk/libdvdcss/libdvdcss.c	Sat Jun  5 08:28:58 2010	(r31318)
+++ trunk/libdvdcss/libdvdcss.c	Sat Jun  5 08:41:43 2010	(r31319)
@@ -367,12 +367,12 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( 
     if( dvdcss->b_ioctls )
     {
         i_ret = _dvdcss_test( dvdcss );
-        if( i_ret == -2 )
+
+        if( i_ret == -3 )
         {
-            /* Scrambled disk, RPC-II drive, no region set: bail out */
-            free( dvdcss->psz_device );
-            free( dvdcss );
-            return NULL;
+            print_debug( dvdcss, "scrambled disc on a region-free RPC-II "
+                                 "drive: possible failure, but continuing "
+                                 "anyway" );
         }
         else if( i_ret < 0 )
         {