RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-11 08:37:59 +00:00
Code Issues Releases Wiki Activity

Sync libdvdcss with their latest SVN.

Browse Source 
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
This commit is contained in:
reimar 2010-06-05 06:41:43 +00:00
parent e22ebfddb1
commit 06d20bd774
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdvdcss/css.c
View File

@ -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 )

10
libdvdcss/libdvdcss.c
View File

@ -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 )
{