diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-29 15:32:56 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-29 15:32:56 +0000 |
| commit | 36048f18e110f40a6d3571cefcd15882d54ef3ff (patch) | |
| tree | 969adbed7e709cb6465c777146b8d7d6247f65cd /libmpdvdkit2/libdvdcss.c | |
| parent | 7f69df17784d0a7b09aefc08e6e89868565e8e0f (diff) | |
| download | mpv-36048f18e110f40a6d3571cefcd15882d54ef3ff.tar.bz2 mpv-36048f18e110f40a6d3571cefcd15882d54ef3ff.tar.xz | |
update libdvdcss in libmpdvdkit to latest version (1.2.4)
patch by Andreas Hess <jaska@gmx.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8638 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2/libdvdcss.c')
| -rw-r--r-- | libmpdvdkit2/libdvdcss.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpdvdkit2/libdvdcss.c b/libmpdvdkit2/libdvdcss.c index 2a162c4888..4161bb7974 100644 --- a/libmpdvdkit2/libdvdcss.c +++ b/libmpdvdkit2/libdvdcss.c @@ -273,8 +273,8 @@ extern dvdcss_t dvdcss_open ( char *psz_target ) 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=§or[40]; int i=31; @@ -363,7 +363,7 @@ extern int dvdcss_seek ( dvdcss_t dvdcss, int i_blocks, int i_flags ) } } - return _dvdcss_seek( dvdcss, i_blocks ); + return dvdcss->pf_seek( dvdcss, i_blocks ); } /** @@ -395,7 +395,7 @@ extern int dvdcss_read ( dvdcss_t dvdcss, void *p_buffer, { 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 @@ extern int dvdcss_readv ( dvdcss_t dvdcss, void *p_iovec, 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 |