Mercurial > mplayer.hg

changeset 31253:b470391059f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sync libdvdcss with their latest SVN. In particular fixes a wring return value check which caused descrambling to be aborted for no good reason.
author reimar
date Sat, 05 Jun 2010 06:41:43 +0000
parents eff096c1ea0a
children e888e262e3f0
files libdvdcss/css.c libdvdcss/libdvdcss.c
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libdvdcss/css.c	Sat Jun 05 06:28:58 2010 +0000
+++ b/libdvdcss/css.c	Sat Jun 05 06:41:43 2010 +0000
@@ -158,7 +158,7 @@
         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 )
--- a/libdvdcss/libdvdcss.c	Sat Jun 05 06:28:58 2010 +0000
+++ b/libdvdcss/libdvdcss.c	Sat Jun 05 06:41:43 2010 +0000
@@ -367,12 +367,12 @@
     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 )
         {