Mercurial > mplayer.hg
changeset 32265:cda66f57f7a5
Sync some minor changes from upstream libdvdcss, up to r237.
| author | diego |
|---|---|
| date | Sat, 25 Sep 2010 15:53:03 +0000 |
| parents | f1884cb8d0ee |
| children | 69b7023c6780 |
| files | Copyright libdvdcss/bsdi_dvd.h libdvdcss/common.h libdvdcss/css.h libdvdcss/csstables.h libdvdcss/device.h libdvdcss/ioctl.h libdvdcss/libdvdcss.h |
| diffstat | 8 files changed, 36 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Copyright Sat Sep 25 13:01:33 2010 +0000 +++ b/Copyright Sat Sep 25 15:53:03 2010 +0000 @@ -30,7 +30,7 @@ Name: libdvdcss -Version: Subversion r231 +Version: Subversion r237 + local changes URL: http://developers.videolan.org/libdvdcss/ Directory: libdvdcss Copyright: 1998-2008 VideoLAN
--- a/libdvdcss/bsdi_dvd.h Sat Sep 25 13:01:33 2010 +0000 +++ b/libdvdcss/bsdi_dvd.h Sat Sep 25 15:53:03 2010 +0000 @@ -2,8 +2,8 @@ * $Id$ */ -#ifndef DVDCSS_DVD_H -#define DVDCSS_DVD_H +#ifndef DVDCSS_BSDI_DVD_H +#define DVDCSS_BSDI_DVD_H #include <sys/cdefs.h> #include <machine/endian.h> @@ -341,4 +341,4 @@ int error; } tracktype; -#endif /* DVDCSS_DVD_H */ +#endif /* DVDCSS_BSDI_DVD_H */
--- a/libdvdcss/common.h Sat Sep 25 13:01:33 2010 +0000 +++ b/libdvdcss/common.h Sat Sep 25 15:53:03 2010 +0000 @@ -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 @@ #endif +#endif /* DVDCSS_COMMON_H */
--- a/libdvdcss/css.h Sat Sep 25 13:01:33 2010 +0000 +++ b/libdvdcss/css.h Sat Sep 25 15:53:03 2010 +0000 @@ -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_titlekey ( dvdcss_t, int , dvd_key_t ); int _dvdcss_unscramble ( uint8_t *, uint8_t * ); +#endif /* DVDCSS_CSS_H */
--- a/libdvdcss/csstables.h Sat Sep 25 13:01:33 2010 +0000 +++ b/libdvdcss/csstables.h Sat Sep 25 15:53:03 2010 +0000 @@ -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 @@ 0xC3, 0x82, 0xC9, 0x15, 0x57, 0x16, 0x5D, 0x81 }; +#endif /* DVDCSS_CSSTABLES_H */
--- a/libdvdcss/device.h Sat Sep 25 13:01:33 2010 +0000 +++ b/libdvdcss/device.h Sat Sep 25 15:53:03 2010 +0000 @@ -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 <sys/uio.h> /* struct iovec */ #endif +#include "dvdcss/dvdcss.h" + #if defined( WIN32 ) && !defined( SYS_CYGWIN ) struct iovec { @@ -56,3 +61,4 @@ int _dvdcss_raw_open ( dvdcss_t, char const * ); #endif +#endif /* DVDCSS_DEVICE_H */
--- a/libdvdcss/ioctl.h Sat Sep 25 13:01:33 2010 +0000 +++ b/libdvdcss/ioctl.h Sat Sep 25 15:53:03 2010 +0000 @@ -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 @@ #pragma pack() #endif + +#endif /* DVDCSS_IOCTL_H */
--- a/libdvdcss/libdvdcss.h Sat Sep 25 13:01:33 2010 +0000 +++ b/libdvdcss/libdvdcss.h Sat Sep 25 15:53:03 2010 +0000 @@ -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 @@ void _print_error ( dvdcss_t, char * ); +#endif /* DVDCSS_LIBDVDCSS_H */