Mercurial > mplayer.hg

annotate libmpdvdkit2/libdvdcss_changes.diff @ 20256:75de24f3ed6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r20237
author gpoirier
date Mon, 16 Oct 2006 09:32:41 +0000
parents e5d97c5f3c32
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
16847
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
1 --- common.h 2005-10-11 10:55:45.000000000 +0200
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
2 +++ common.h 2005-10-11 14:07:42.000000000 +0200
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
3 @@ -50,10 +53,9 @@
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
4 # define PATH_MAX MAX_PATH
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
5 #endif
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
6
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
7 -#define lseek _lseeki64
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
8 -
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
9 /* several type definitions */
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
10 # if defined( __MINGW32__ )
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
11 +#define lseek _lseeki64
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
12 # if !defined( _OFF_T_ )
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
13 typedef long long _off_t;
72c1c7054ad5 10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents: 16714
diff changeset
14 typedef _off_t off_t;
16630
954cdf2171f6 upgrade to libdvdcss 1.2.9
diego
parents: 15692
diff changeset
15 --- device.c 2005-07-11 13:33:34.000000000 +0200
954cdf2171f6 upgrade to libdvdcss 1.2.9
diego
parents: 15692
diff changeset
16 +++ device.c 2005-10-01 19:08:07.000000000 +0200
954cdf2171f6 upgrade to libdvdcss 1.2.9
diego
parents: 15692
diff changeset
17 @@ -143,8 +132,11 @@
954cdf2171f6 upgrade to libdvdcss 1.2.9
diego
parents: 15692
diff changeset
18 print_debug( dvdcss, "opening target `%s'", psz_device );
14861
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
19
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
20 #if defined( WIN32 )
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
21 - /* If device is not "X:", we are actually opening a file. */
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
22 - dvdcss->b_file = !psz_device[0] || psz_device[1] != ':' || psz_device[2];
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
23 + dvdcss->b_file = 1;
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
24 + /* If device is "X:" or "X:\", we are not actually opening a file. */
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
25 + if (psz_device[0] && psz_device[1] == ':' &&
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
26 + (!psz_device[2] || (psz_device[2] == '\\' && !psz_device[3])))
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
27 + dvdcss->b_file = 0;
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
28
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
29 /* Initialize readv temporary buffer */
caf9d95cd508 MPlayer-specific changes to libdvdcss
diego
parents:
diff changeset
30 dvdcss->p_readv_buffer = NULL;
16630
954cdf2171f6 upgrade to libdvdcss 1.2.9
diego
parents: 15692
diff changeset
31 --- libdvdcss.c 2004-08-13 15:40:18.000000000 +0200
954cdf2171f6 upgrade to libdvdcss 1.2.9
diego
parents: 15692
diff changeset
32 +++ libdvdcss.c 2005-10-01 19:11:27.000000000 +0200
18109
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
33 @@ -301,6 +301,10 @@
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
34 {
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
35 psz_home = getenv( "HOME" );
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
36 }
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
37 + if( psz_home == NULL )
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
38 + {
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
39 + psz_home = getenv( "USERPROFILE" );
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
40 + }
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
41
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
42 /* Cache our keys in ${HOME}/.dvdcss/ */
68145aae7349 fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents: 16848
diff changeset
43 if( psz_home )