summaryrefslogtreecommitdiffstats
path: root/libmpdvdkit2/dvd_reader.c
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/dvd_reader.c
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/dvd_reader.c')
-rw-r--r--libmpdvdkit2/dvd_reader.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpdvdkit2/dvd_reader.c b/libmpdvdkit2/dvd_reader.c
index db9ec919ba..0a48c7fc21 100644
--- a/libmpdvdkit2/dvd_reader.c
+++ b/libmpdvdkit2/dvd_reader.c
@@ -154,7 +154,7 @@ static int initAllCSSKeys( dvd_reader_t *dvd )
extern char * get_path( char * filename );
#endif
-extern char * dvdcss_cache_dir;
+//extern char * dvdcss_cache_dir;
/**
* Open a DVD image or block device file.
@@ -164,13 +164,14 @@ static dvd_reader_t *DVDOpenImageFile( const char *location, int have_css )
dvd_reader_t *dvd;
dvd_input_t dev;
- /* setup cache dir */
+ /* setup cache dir is no longer needed, it's now implemented in libdvdcss.c
if(!dvdcss_cache_dir){
dvdcss_cache_dir=get_path( "" );
if ( dvdcss_cache_dir ) { mkdir( dvdcss_cache_dir,493 ); free( dvdcss_cache_dir ); }
dvdcss_cache_dir=get_path( "DVDKeys" );
if(dvdcss_cache_dir) mkdir( dvdcss_cache_dir,493 );
}
+ */
/* open it */
dev = DVDinput_open( location );