Mercurial > mplayer.hg

diff libmpdvdkit2/libdvdcss.c @ 8637:0211de3039eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update libdvdcss in libmpdvdkit to latest version (1.2.4) patch by Andreas Hess <jaska@gmx.net>
author arpi
date Sun, 29 Dec 2002 15:32:56 +0000
parents 9fc45fe0d444
children a2fa276b8ec7
line wrap: on
line diff
--- a/libmpdvdkit2/libdvdcss.c	Sun Dec 29 15:10:02 2002 +0000
+++ b/libmpdvdkit2/libdvdcss.c	Sun Dec 29 15:32:56 2002 +0000
@@ -273,8 +273,8 @@
 	char sector[DVDCSS_BLOCK_SIZE];
 	// 32768+40  -> disc title (32 uppercase chars)
 	// 32768+813 -> disc manufacturing date + serial no (16 digit number)
-	_dvdcss_seek( dvdcss, 32768/DVDCSS_BLOCK_SIZE);
-	if(_dvdcss_read( dvdcss, sector, 1) == 1){
+	dvdcss->pf_seek( dvdcss, 32768/DVDCSS_BLOCK_SIZE);
+	if(dvdcss->pf_read( dvdcss, sector, 1) == 1){
 	    // check disc title first:
 	    char* title_name=&sector[40];
 	    int i=31;
@@ -363,7 +363,7 @@
         }
     }
 
-    return _dvdcss_seek( dvdcss, i_blocks );
+    return dvdcss->pf_seek( dvdcss, i_blocks );
 }
 
 /**
@@ -395,7 +395,7 @@
 {
     int i_ret, i_index;
 
-    i_ret = _dvdcss_read( dvdcss, p_buffer, i_blocks );
+    i_ret = dvdcss->pf_read( dvdcss, p_buffer, i_blocks );
 
     if( i_ret <= 0
          || !dvdcss->b_scrambled
@@ -471,7 +471,7 @@
     void *iov_base;
     size_t iov_len;
 
-    i_ret = _dvdcss_readv( dvdcss, _p_iovec, i_blocks );
+    i_ret = dvdcss->pf_readv( dvdcss, _p_iovec, i_blocks );
 
     if( i_ret <= 0
          || !dvdcss->b_scrambled