mplayer.hg: libmpdvdkit2/libdvdcss

annotate libmpdvdkit2/libdvdcss_changes.diff @ 16848:279cd50f2ba0

Switch from our own to the upstream DVD key caching strategy and directory. Should work just as well while reducing our diff towards upstream and enhancing compatibility with external libdvdcss implementations.

author	diego
date	Mon, 24 Oct 2005 09:50:42 +0000
parents	72c1c7054ad5
children	68145aae7349

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;
16714 2ab52c9b72b9 Replace unconditional #defines by build system trickery. diego parents: 16630 diff changeset	15 --- css.c 2005-07-11 14:24:09.000000000 +0200
2ab52c9b72b9 Replace unconditional #defines by build system trickery. diego parents: 16630 diff changeset	16 +++ css.c 2005-10-01 20:14:37.000000000 +0200
2ab52c9b72b9 Replace unconditional #defines by build system trickery. diego parents: 16630 diff changeset	17 @@ -53,7 +56,7 @@
2ab52c9b72b9 Replace unconditional #defines by build system trickery. diego parents: 16630 diff changeset	18 # include <limits.h>
14861 caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	19 #endif
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	20
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	21 -#include "dvdcss/dvdcss.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	22 +#include "dvdcss.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	23
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	24 #include "common.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	25 #include "css.h"
16630 954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	26 --- device.c 2005-07-11 13:33:34.000000000 +0200
954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	27 +++ device.c 2005-10-01 19:08:07.000000000 +0200
954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	28 @@ -55,7 +44,7 @@
14861 caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	29 # include <sys/uio.h> /* struct iovec */
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	30 #endif
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	31
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	32 -#include "dvdcss/dvdcss.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	33 +#include "dvdcss.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	34
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	35 #include "common.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	36 #include "css.h"
16630 954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	37 @@ -143,8 +132,11 @@
954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	38 print_debug( dvdcss, "opening target `%s'", psz_device );
14861 caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	39
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	40 #if defined( WIN32 )
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	41 - /* If device is not "X:", we are actually opening a file. */
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	42 - dvdcss->b_file = !psz_device[0] \|\| psz_device[1] != ':' \|\| psz_device[2];
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	43 + dvdcss->b_file = 1;
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	44 + /* If device is "X:" or "X:\", we are not actually opening a file. */
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	45 + if (psz_device[0] && psz_device[1] == ':' &&
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	46 + (!psz_device[2] \|\| (psz_device[2] == '\\' && !psz_device[3])))
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	47 + dvdcss->b_file = 0;
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	48
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	49 /* Initialize readv temporary buffer */
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	50 dvdcss->p_readv_buffer = NULL;
16630 954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	51 --- error.c 2004-02-24 16:46:49.000000000 +0100
16714 2ab52c9b72b9 Replace unconditional #defines by build system trickery. diego parents: 16630 diff changeset	52 +++ error.c 2005-10-01 20:15:46.000000000 +0200
2ab52c9b72b9 Replace unconditional #defines by build system trickery. diego parents: 16630 diff changeset	53 @@ -34,7 +37,7 @@
16630 954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	54 # include <limits.h>
16714 2ab52c9b72b9 Replace unconditional #defines by build system trickery. diego parents: 16630 diff changeset	55 #endif
16630 954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	56
14861 caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	57 -#include "dvdcss/dvdcss.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	58 +#include "dvdcss.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	59
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	60 #include "common.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	61 #include "css.h"
16630 954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	62 --- libdvdcss.c 2004-08-13 15:40:18.000000000 +0200
954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	63 +++ libdvdcss.c 2005-10-01 19:11:27.000000000 +0200
16714 2ab52c9b72b9 Replace unconditional #defines by build system trickery. diego parents: 16630 diff changeset	64 @@ -124,7 +127,7 @@
2ab52c9b72b9 Replace unconditional #defines by build system trickery. diego parents: 16630 diff changeset	65 # include <direct.h>
2ab52c9b72b9 Replace unconditional #defines by build system trickery. diego parents: 16630 diff changeset	66 #endif
16630 954cdf2171f6 upgrade to libdvdcss 1.2.9 diego parents: 15692 diff changeset	67
14861 caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	68 -#include "dvdcss/dvdcss.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	69 +#include "dvdcss.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	70
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	71 #include "common.h"
caf9d95cd508 MPlayer-specific changes to libdvdcss diego parents: diff changeset	72 #include "css.h"

Mercurial > mplayer.hg

annotate libmpdvdkit2/libdvdcss_changes.diff @ 16848:279cd50f2ba0