diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-09-13 13:36:49 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-09-13 13:36:49 +0000 |
commit | 812a6750d34eb14d6f94cd489b741785296c6895 (patch) | |
tree | b7f2f1fb37510ffe79f25d88c06f3e73fcd3eaf3 /libmpdvdkit2 | |
parent | 5e238d8a8f7db9bb52dd54db6579a367f980bf47 (diff) | |
download | mpv-812a6750d34eb14d6f94cd489b741785296c6895.tar.bz2 mpv-812a6750d34eb14d6f94cd489b741785296c6895.tar.xz |
Move dvdcss.h to a dvdcss subdirectory, just like upstream libdvdcss does.
This considerably reduces our local patch size.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19826 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdvdkit2')
-rw-r--r-- | libmpdvdkit2/FILES | 2 | ||||
-rw-r--r-- | libmpdvdkit2/css.c | 2 | ||||
-rw-r--r-- | libmpdvdkit2/device.c | 2 | ||||
-rw-r--r-- | libmpdvdkit2/dvd_input.c | 2 | ||||
-rw-r--r-- | libmpdvdkit2/dvdcss/dvdcss.h (renamed from libmpdvdkit2/dvdcss.h) | 0 | ||||
-rw-r--r-- | libmpdvdkit2/error.c | 2 | ||||
-rw-r--r-- | libmpdvdkit2/libdvdcss.c | 2 | ||||
-rw-r--r-- | libmpdvdkit2/libdvdcss_changes.diff | 40 | ||||
-rw-r--r-- | libmpdvdkit2/libdvdread_changes.diff | 2 |
9 files changed, 7 insertions, 47 deletions
diff --git a/libmpdvdkit2/FILES b/libmpdvdkit2/FILES index 0a8eabb810..ae966b5d37 100644 --- a/libmpdvdkit2/FILES +++ b/libmpdvdkit2/FILES @@ -34,7 +34,7 @@ css.h csstables.h device.c device.h -dvdcss.h +dvdcss/dvdcss.h error.c ioctl.c ioctl.h diff --git a/libmpdvdkit2/css.c b/libmpdvdkit2/css.c index bbd05b4224..8d736ba595 100644 --- a/libmpdvdkit2/css.c +++ b/libmpdvdkit2/css.c @@ -56,7 +56,7 @@ # include <limits.h> #endif -#include "dvdcss.h" +#include "dvdcss/dvdcss.h" #include "common.h" #include "css.h" diff --git a/libmpdvdkit2/device.c b/libmpdvdkit2/device.c index 953ca41774..53d05bf3cb 100644 --- a/libmpdvdkit2/device.c +++ b/libmpdvdkit2/device.c @@ -58,7 +58,7 @@ # include <sys/uio.h> /* struct iovec */ #endif -#include "dvdcss.h" +#include "dvdcss/dvdcss.h" #include "common.h" #include "css.h" diff --git a/libmpdvdkit2/dvd_input.c b/libmpdvdkit2/dvd_input.c index 4b1bad1dc3..8478970a6d 100644 --- a/libmpdvdkit2/dvd_input.c +++ b/libmpdvdkit2/dvd_input.c @@ -41,7 +41,7 @@ char * (*dvdinput_error) (dvd_input_t); #ifdef HAVE_DVDCSS_DVDCSS_H /* linking to libdvdcss */ -#include "dvdcss.h" +#include "dvdcss/dvdcss.h" #define DVDcss_open(a) dvdcss_open((char*)(a)) #define DVDcss_close dvdcss_close #define DVDcss_seek dvdcss_seek diff --git a/libmpdvdkit2/dvdcss.h b/libmpdvdkit2/dvdcss/dvdcss.h index d2134bff49..d2134bff49 100644 --- a/libmpdvdkit2/dvdcss.h +++ b/libmpdvdkit2/dvdcss/dvdcss.h diff --git a/libmpdvdkit2/error.c b/libmpdvdkit2/error.c index f23095bb13..7b8abffd04 100644 --- a/libmpdvdkit2/error.c +++ b/libmpdvdkit2/error.c @@ -37,7 +37,7 @@ # include <limits.h> #endif -#include "dvdcss.h" +#include "dvdcss/dvdcss.h" #include "common.h" #include "css.h" diff --git a/libmpdvdkit2/libdvdcss.c b/libmpdvdkit2/libdvdcss.c index c53647024e..b1aba02a96 100644 --- a/libmpdvdkit2/libdvdcss.c +++ b/libmpdvdkit2/libdvdcss.c @@ -127,7 +127,7 @@ # include <direct.h> #endif -#include "dvdcss.h" +#include "dvdcss/dvdcss.h" #include "common.h" #include "css.h" diff --git a/libmpdvdkit2/libdvdcss_changes.diff b/libmpdvdkit2/libdvdcss_changes.diff index 3ebb25950a..4bd4f41cce 100644 --- a/libmpdvdkit2/libdvdcss_changes.diff +++ b/libmpdvdkit2/libdvdcss_changes.diff @@ -12,28 +12,8 @@ # if !defined( _OFF_T_ ) typedef long long _off_t; typedef _off_t off_t; ---- css.c 2005-07-11 14:24:09.000000000 +0200 -+++ css.c 2005-10-01 20:14:37.000000000 +0200 -@@ -53,7 +56,7 @@ - # include <limits.h> - #endif - --#include "dvdcss/dvdcss.h" -+#include "dvdcss.h" - - #include "common.h" - #include "css.h" --- device.c 2005-07-11 13:33:34.000000000 +0200 +++ device.c 2005-10-01 19:08:07.000000000 +0200 -@@ -55,7 +44,7 @@ - # include <sys/uio.h> /* struct iovec */ - #endif - --#include "dvdcss/dvdcss.h" -+#include "dvdcss.h" - - #include "common.h" - #include "css.h" @@ -143,8 +132,11 @@ print_debug( dvdcss, "opening target `%s'", psz_device ); @@ -48,28 +28,8 @@ /* Initialize readv temporary buffer */ dvdcss->p_readv_buffer = NULL; ---- error.c 2004-02-24 16:46:49.000000000 +0100 -+++ error.c 2005-10-01 20:15:46.000000000 +0200 -@@ -34,7 +37,7 @@ - # include <limits.h> - #endif - --#include "dvdcss/dvdcss.h" -+#include "dvdcss.h" - - #include "common.h" - #include "css.h" --- libdvdcss.c 2004-08-13 15:40:18.000000000 +0200 +++ libdvdcss.c 2005-10-01 19:11:27.000000000 +0200 -@@ -124,7 +127,7 @@ - # include <direct.h> - #endif - --#include "dvdcss/dvdcss.h" -+#include "dvdcss.h" - - #include "common.h" - #include "css.h" @@ -301,6 +301,10 @@ { psz_home = getenv( "HOME" ); diff --git a/libmpdvdkit2/libdvdread_changes.diff b/libmpdvdkit2/libdvdread_changes.diff index 0774cc8f49..326f7c1608 100644 --- a/libmpdvdkit2/libdvdread_changes.diff +++ b/libmpdvdkit2/libdvdread_changes.diff @@ -78,7 +78,7 @@ diff -Naur dvdread.orig/dvd_input.c dvdread/dvd_input.c #ifdef HAVE_DVDCSS_DVDCSS_H /* linking to libdvdcss */ -#include <dvdcss/dvdcss.h> -+#include "dvdcss.h" ++#include "dvdcss/dvdcss.h" #define DVDcss_open(a) dvdcss_open((char*)(a)) #define DVDcss_close dvdcss_close #define DVDcss_seek dvdcss_seek |