diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-05 06:41:43 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-06-05 06:41:43 +0000 |
| commit | 06d20bd7748d2d3138d69ea8d9a2aa6e192a8b1b (patch) | |
| tree | 968ce60278e176a19399a23593a1223963f31734 /libdvdcss | |
| parent | e22ebfddb1e8c652e1750f36044b53684161301c (diff) | |
| download | mpv-06d20bd7748d2d3138d69ea8d9a2aa6e192a8b1b.tar.bz2 mpv-06d20bd7748d2d3138d69ea8d9a2aa6e192a8b1b.tar.xz | |
Sync libdvdcss with their latest SVN.
In particular fixes a wring return value check which caused descrambling
to be aborted for no good reason.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31319 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdvdcss')
| -rw-r--r-- | libdvdcss/css.c | 2 | ||||
| -rw-r--r-- | libdvdcss/libdvdcss.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libdvdcss/css.c b/libdvdcss/css.c index 2bb4f18833..264f43a1a9 100644 --- a/libdvdcss/css.c +++ b/libdvdcss/css.c @@ -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 ) diff --git a/libdvdcss/libdvdcss.c b/libdvdcss/libdvdcss.c index f39d7025d4..d13d0c9a4d 100644 --- a/libdvdcss/libdvdcss.c +++ b/libdvdcss/libdvdcss.c @@ -367,12 +367,12 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target ) 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 ) { |