summaryrefslogtreecommitdiffstats
path: root/libmpdvdkit2/libdvdcss.h
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-02-08 00:22:39 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-02-08 00:22:39 +0000
commitb606cb19527d294cfd05011de5dfd47b6c023296 (patch)
tree3ff67c8a11c35dceae1e87617329133dbd566dc8 /libmpdvdkit2/libdvdcss.h
parent4e8a50437110dc3d70e406c8d3dbf2a522ff5594 (diff)
downloadmpv-b606cb19527d294cfd05011de5dfd47b6c023296.tar.bz2
mpv-b606cb19527d294cfd05011de5dfd47b6c023296.tar.xz
sync with libdvdcss 1.2.5 (including u8->uint8_t and whitespace cosmetics...)
patch by Andreas Hess <jaska@gmx.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9334 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2/libdvdcss.h')
-rw-r--r--libmpdvdkit2/libdvdcss.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/libmpdvdkit2/libdvdcss.h b/libmpdvdkit2/libdvdcss.h
index cb37bf498e..473644d5ef 100644
--- a/libmpdvdkit2/libdvdcss.h
+++ b/libmpdvdkit2/libdvdcss.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * private.h: private DVD reading library data
+ * libdvdcss.h: private DVD reading library data
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id$
@@ -11,7 +11,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -33,7 +33,7 @@ struct dvdcss_s
char * psz_device;
int i_fd;
int i_read_fd;
- int i_seekpos;
+ int i_pos;
/* File handling */
int ( * pf_seek ) ( dvdcss_t, int );
@@ -46,7 +46,10 @@ struct dvdcss_s
int b_ioctls;
int b_scrambled;
dvd_title_t *p_titles;
- char * psz_cache;
+
+ /* Key cache directory and pointer to the filename */
+ char psz_cachefile[PATH_MAX];
+ char * psz_block;
/* Error management */
char * psz_error;