From c8a97067aa0763bcebf3ab7d5371bd682b53098f Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 25 Sep 2010 15:53:03 +0000 Subject: libdvdcss: Sync some minor changes from upstream, up to r237 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32349 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Copyright | 2 +- libdvdcss/bsdi_dvd.h | 6 +++--- libdvdcss/common.h | 4 ++++ libdvdcss/css.h | 7 +++++++ libdvdcss/csstables.h | 3 +++ libdvdcss/device.h | 6 ++++++ libdvdcss/ioctl.h | 5 +++++ libdvdcss/libdvdcss.h | 7 +++++++ 8 files changed, 36 insertions(+), 4 deletions(-) diff --git a/Copyright b/Copyright index a1eb2bf510..9a7b7e0ab6 100644 --- a/Copyright +++ b/Copyright @@ -30,7 +30,7 @@ License: GNU General Public License Name: libdvdcss -Version: Subversion r231 +Version: Subversion r237 + local changes URL: http://developers.videolan.org/libdvdcss/ Directory: libdvdcss Copyright: 1998-2008 VideoLAN diff --git a/libdvdcss/bsdi_dvd.h b/libdvdcss/bsdi_dvd.h index f4c8b89f6d..2c50c898b1 100644 --- a/libdvdcss/bsdi_dvd.h +++ b/libdvdcss/bsdi_dvd.h @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef DVDCSS_DVD_H -#define DVDCSS_DVD_H +#ifndef DVDCSS_BSDI_DVD_H +#define DVDCSS_BSDI_DVD_H #include #include @@ -341,4 +341,4 @@ typedef struct int error; } tracktype; -#endif /* DVDCSS_DVD_H */ +#endif /* DVDCSS_BSDI_DVD_H */ diff --git a/libdvdcss/common.h b/libdvdcss/common.h index 931413fb15..bee5aadd50 100644 --- a/libdvdcss/common.h +++ b/libdvdcss/common.h @@ -24,6 +24,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *****************************************************************************/ +#ifndef DVDCSS_COMMON_H +#define DVDCSS_COMMON_H + /***************************************************************************** * Basic types definitions *****************************************************************************/ @@ -79,3 +82,4 @@ typedef __int64 off_t; #endif +#endif /* DVDCSS_COMMON_H */ diff --git a/libdvdcss/css.h b/libdvdcss/css.h index 55f0df8aff..0838f26c45 100644 --- a/libdvdcss/css.h +++ b/libdvdcss/css.h @@ -26,6 +26,12 @@ * with libdvdcss; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *****************************************************************************/ + +#ifndef DVDCSS_CSS_H +#define DVDCSS_CSS_H + +#include "dvdcss/dvdcss.h" + #define KEY_SIZE 5 typedef uint8_t dvd_key_t[KEY_SIZE]; @@ -54,3 +60,4 @@ int _dvdcss_disckey ( dvdcss_t ); int _dvdcss_titlekey ( dvdcss_t, int , dvd_key_t ); int _dvdcss_unscramble ( uint8_t *, uint8_t * ); +#endif /* DVDCSS_CSS_H */ diff --git a/libdvdcss/csstables.h b/libdvdcss/csstables.h index 1c00685bcc..84c3ebf85c 100644 --- a/libdvdcss/csstables.h +++ b/libdvdcss/csstables.h @@ -29,6 +29,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *****************************************************************************/ +#ifndef DVDCSS_CSSTABLES_H +#define DVDCSS_CSSTABLES_H static uint8_t p_css_tab1[ 256 ] = { @@ -390,3 +392,4 @@ static uint8_t p_crypt_tab3[ 288 ] = 0xC3, 0x82, 0xC9, 0x15, 0x57, 0x16, 0x5D, 0x81 }; +#endif /* DVDCSS_CSSTABLES_H */ diff --git a/libdvdcss/device.h b/libdvdcss/device.h index 33c53ac64f..ddaa18eb98 100644 --- a/libdvdcss/device.h +++ b/libdvdcss/device.h @@ -23,6 +23,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *****************************************************************************/ +#ifndef DVDCSS_DEVICE_H +#define DVDCSS_DEVICE_H + /***************************************************************************** * iovec structure: vectored data entry *****************************************************************************/ @@ -33,6 +36,8 @@ # include /* struct iovec */ #endif +#include "dvdcss/dvdcss.h" + #if defined( WIN32 ) && !defined( SYS_CYGWIN ) struct iovec { @@ -56,3 +61,4 @@ int _dvdcss_close ( dvdcss_t ); int _dvdcss_raw_open ( dvdcss_t, char const * ); #endif +#endif /* DVDCSS_DEVICE_H */ diff --git a/libdvdcss/ioctl.h b/libdvdcss/ioctl.h index ef6ae8a9d4..ebc972eb7c 100644 --- a/libdvdcss/ioctl.h +++ b/libdvdcss/ioctl.h @@ -21,6 +21,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *****************************************************************************/ +#ifndef DVDCSS_IOCTL_H +#define DVDCSS_IOCTL_H + int ioctl_ReadCopyright ( int, int, int * ); int ioctl_ReadDiscKey ( int, int *, uint8_t * ); int ioctl_ReadTitleKey ( int, int *, int, uint8_t * ); @@ -427,3 +430,5 @@ struct OS2_ExecSCSICmd #pragma pack() #endif + +#endif /* DVDCSS_IOCTL_H */ diff --git a/libdvdcss/libdvdcss.h b/libdvdcss/libdvdcss.h index 35ffc9b9de..6db228c1ca 100644 --- a/libdvdcss/libdvdcss.h +++ b/libdvdcss/libdvdcss.h @@ -22,6 +22,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *****************************************************************************/ +#ifndef DVDCSS_LIBDVDCSS_H +#define DVDCSS_LIBDVDCSS_H + +#include "dvdcss/dvdcss.h" +#include "css.h" + struct iovec; /***************************************************************************** @@ -102,3 +108,4 @@ __forceinline void print_debug(dvdcss_t dvdcss, const char *msg,...) void _print_error ( dvdcss_t, char * ); +#endif /* DVDCSS_LIBDVDCSS_H */ -- cgit v1.2.3