summaryrefslogtreecommitdiffstats
path: root/libmpdvdkit2
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-04-08 17:36:33 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-04-08 17:36:33 +0000
commitcaf9a94289dbcafb091c82b2ed1cc42878681a99 (patch)
tree7d6e0249c1ab21a3eb0ca506dd075ac5d3d952b2 /libmpdvdkit2
parent6ed5e906231000c8a9787d4de39d9bcb583354bf (diff)
downloadmpv-caf9a94289dbcafb091c82b2ed1cc42878681a99.tar.bz2
mpv-caf9a94289dbcafb091c82b2ed1cc42878681a99.tar.xz
forwardport: warning fix and netbsd fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9883 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2')
-rw-r--r--libmpdvdkit2/libdvdcss.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libmpdvdkit2/libdvdcss.c b/libmpdvdkit2/libdvdcss.c
index 12d5eddea1..4ea767ea9c 100644
--- a/libmpdvdkit2/libdvdcss.c
+++ b/libmpdvdkit2/libdvdcss.c
@@ -117,6 +117,12 @@
#define SYS_CYGWIN
#endif
+#ifndef HAVE_MPLAYER
+ #include "get_path.c"
+#else
+ extern char * get_path( char * filename );
+#endif
+
/**
* \brief Symbol for version checks.
*
@@ -390,7 +396,7 @@ extern dvdcss_t dvdcss_open ( char *psz_target )
goto nocache;
}
- i += sprintf( dvdcss->psz_cachefile + i, "/%s/", psz_data );
+ i += sprintf( dvdcss->psz_cachefile + i, "/%s", psz_data );
#if !defined( WIN32 ) || defined( SYS_CYGWIN )
i_ret = mkdir( dvdcss->psz_cachefile, 0755 );
#else
@@ -402,6 +408,7 @@ extern dvdcss_t dvdcss_open ( char *psz_target )
dvdcss->psz_cachefile[0] = '\0';
goto nocache;
}
+ i += sprintf( dvdcss->psz_cachefile + i, "/");
/* Pointer to the filename we will use. */
dvdcss->psz_block = dvdcss->psz_cachefile + i;