summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog1
-rw-r--r--Copyright4
-rw-r--r--libdvdcss/common.h2
-rw-r--r--libdvdcss/css.c2
-rw-r--r--libdvdcss/device.h2
-rw-r--r--libdvdcss/dvdcss/dvdcss.h4
-rw-r--r--libdvdcss/error.c2
-rw-r--r--libdvdcss/ioctl.c2
-rw-r--r--libdvdcss/ioctl.h2
-rw-r--r--libdvdcss/libdvdcss.c12
-rw-r--r--libdvdcss/libdvdcss.h2
11 files changed, 18 insertions, 17 deletions
diff --git a/Changelog b/Changelog
index abbbc29d01..80226b871d 100644
--- a/Changelog
+++ b/Changelog
@@ -81,6 +81,7 @@ MPlayer (1.0)
* support for DOS-style file:///x:/path paths
* some new slave commands (check DOCS/tech/slave.txt)
* misc fixes to libass
+ * libdvdcss updated to 1.2.10, now same as upstream version
Ports:
* small crash with vo_macosx fixed
diff --git a/Copyright b/Copyright
index 3e7349feba..9f22139328 100644
--- a/Copyright
+++ b/Copyright
@@ -42,10 +42,10 @@ Copyright: 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
License: GNU General Public License
Name: libdvdcss
-Version: Subversion r212 (post 1.2.9 release)
+Version: 1.2.10
Homepage: http://developers.videolan.org/libdvdcss/
Directory: libdvdcss
-Copyright: 1998-2006 VideoLAN
+Copyright: 1998-2008 VideoLAN
License: GNU General Public License
Name: libdvdread
diff --git a/libdvdcss/common.h b/libdvdcss/common.h
index 8e97fc3ab1..aff5ccbaa7 100644
--- a/libdvdcss/common.h
+++ b/libdvdcss/common.h
@@ -5,7 +5,7 @@
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id$
*
- * Authors: Samuel Hocevar <sam@via.ecp.fr>
+ * Authors: Sam Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
*
diff --git a/libdvdcss/css.c b/libdvdcss/css.c
index 8e0e8eb919..4e24bbf68f 100644
--- a/libdvdcss/css.c
+++ b/libdvdcss/css.c
@@ -1,7 +1,7 @@
/*****************************************************************************
* css.c: Functions for DVD authentication and descrambling
*****************************************************************************
- * Copyright (C) 1999-2003 VideoLAN
+ * Copyright (C) 1999-2008 VideoLAN
* $Id$
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
diff --git a/libdvdcss/device.h b/libdvdcss/device.h
index e406539df1..d8a73f0d4e 100644
--- a/libdvdcss/device.h
+++ b/libdvdcss/device.h
@@ -5,7 +5,7 @@
* $Id$
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
- * Samuel Hocevar <sam@zoy.org>
+ * Sam Hocevar <sam@zoy.org>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/libdvdcss/dvdcss/dvdcss.h b/libdvdcss/dvdcss/dvdcss.h
index 77eb42239f..c97f996824 100644
--- a/libdvdcss/dvdcss/dvdcss.h
+++ b/libdvdcss/dvdcss/dvdcss.h
@@ -1,7 +1,7 @@
/**
* \file dvdcss.h
* \author Stéphane Borel <stef@via.ecp.fr>
- * \author Samuel Hocevar <sam@zoy.org>
+ * \author Sam Hocevar <sam@zoy.org>
* \brief The \e libdvdcss public header.
*
* This header contains the public types and functions that applications
@@ -9,7 +9,7 @@
*/
/*
- * Copyright (C) 1998-2002 VideoLAN
+ * Copyright (C) 1998-2008 VideoLAN
* $Id$
*
* This program is free software; you can redistribute it and/or modify
diff --git a/libdvdcss/error.c b/libdvdcss/error.c
index d5c416ff61..66d2b67ad4 100644
--- a/libdvdcss/error.c
+++ b/libdvdcss/error.c
@@ -4,7 +4,7 @@
* Copyright (C) 1998-2002 VideoLAN
* $Id$
*
- * Author: Samuel Hocevar <sam@zoy.org>
+ * Author: Sam Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/libdvdcss/ioctl.c b/libdvdcss/ioctl.c
index 83553a156b..d0903994c7 100644
--- a/libdvdcss/ioctl.c
+++ b/libdvdcss/ioctl.c
@@ -5,7 +5,7 @@
* $Id$
*
* Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
- * Samuel Hocevar <sam@zoy.org>
+ * Sam Hocevar <sam@zoy.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
* Eugenio Jarosiewicz <ej0@cise.ufl.edu>
diff --git a/libdvdcss/ioctl.h b/libdvdcss/ioctl.h
index aa33b50ba1..16f51d251b 100644
--- a/libdvdcss/ioctl.h
+++ b/libdvdcss/ioctl.h
@@ -4,7 +4,7 @@
* Copyright (C) 1999-2001 VideoLAN
* $Id$
*
- * Authors: Samuel Hocevar <sam@zoy.org>
+ * Authors: Sam Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/libdvdcss/libdvdcss.c b/libdvdcss/libdvdcss.c
index f2b70d3b6d..1be814f838 100644
--- a/libdvdcss/libdvdcss.c
+++ b/libdvdcss/libdvdcss.c
@@ -1,10 +1,10 @@
/* libdvdcss.c: DVD reading library.
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
- * Samuel Hocevar <sam@zoy.org>
+ * Sam Hocevar <sam@zoy.org>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
*
- * Copyright (C) 1998-2002 VideoLAN
+ * Copyright (C) 1998-2008 VideoLAN
* $Id$
*
* This program is free software; you can redistribute it and/or modify
@@ -371,8 +371,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
if( i_ret < 0 )
{
- print_debug( dvdcss,
- "could not get disc key" );
+ print_debug( dvdcss, "could not get disc key" );
}
}
else
@@ -474,7 +473,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
{
char psz_tmp[16 + 1];
sprintf( psz_tmp,
- "%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"",
+ "%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x",
psz_serial[0], psz_serial[1], psz_serial[2],
psz_serial[3], psz_serial[4], psz_serial[5],
psz_serial[6], psz_serial[7] );
@@ -490,7 +489,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
psz_key[0] = '-';
for( i = 0; i < KEY_SIZE; i++ )
{
- sprintf( &psz_key[1+i*2], "%.2"PRIx8, dvdcss->css.p_disc_key[i] );
+ sprintf( &psz_key[1+i*2], "%.2x", dvdcss->css.p_disc_key[i] );
}
psz_key[1 + KEY_SIZE * 2] = '\0';
}
@@ -809,3 +808,4 @@ LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t dvdcss )
{
return dvdcss->b_scrambled;
}
+
diff --git a/libdvdcss/libdvdcss.h b/libdvdcss/libdvdcss.h
index 4d081368e9..80f78c3062 100644
--- a/libdvdcss/libdvdcss.h
+++ b/libdvdcss/libdvdcss.h
@@ -5,7 +5,7 @@
* $Id$
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
- * Samuel Hocevar <sam@zoy.org>
+ * Sam Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 20:49:56 +0000