[MPlayer-cvslog] r27494 - in trunk: Changelog Copyright libdvdcss/common.h libdvdcss/css.c libdvdcss/device.h libdvdcss/dvdcss/dvdcss.h libdvdcss/error.c libdvdcss/ioctl.c libdvdcss/ioctl.h libdvdcss/libdvdcss.c libdvdcss/libdvdcss.h
diego
subversion at mplayerhq.hu
Fri Aug 29 22:22:37 CEST 2008
Author: diego
Date: Fri Aug 29 22:22:36 2008
New Revision: 27494
Log:
Sync libdvdcss with upstream version 1.2.10.
Modified:
trunk/Changelog
trunk/Copyright
trunk/libdvdcss/common.h
trunk/libdvdcss/css.c
trunk/libdvdcss/device.h
trunk/libdvdcss/dvdcss/dvdcss.h
trunk/libdvdcss/error.c
trunk/libdvdcss/ioctl.c
trunk/libdvdcss/ioctl.h
trunk/libdvdcss/libdvdcss.c
trunk/libdvdcss/libdvdcss.h
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog (original)
+++ trunk/Changelog Fri Aug 29 22:22:36 2008
@@ -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
Modified: trunk/Copyright
==============================================================================
--- trunk/Copyright (original)
+++ trunk/Copyright Fri Aug 29 22:22:36 2008
@@ -42,10 +42,10 @@ Copyright: 1999-2000 Aaron Holtzman <ah
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
Modified: trunk/libdvdcss/common.h
==============================================================================
--- trunk/libdvdcss/common.h (original)
+++ trunk/libdvdcss/common.h Fri Aug 29 22:22:36 2008
@@ -5,7 +5,7 @@
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id$
*
- * Authors: Samuel Hocevar <sam at via.ecp.fr>
+ * Authors: Sam Hocevar <sam at via.ecp.fr>
* Vincent Seguin <seguin at via.ecp.fr>
* Gildas Bazin <gbazin at netcourrier.com>
*
Modified: trunk/libdvdcss/css.c
==============================================================================
--- trunk/libdvdcss/css.c (original)
+++ trunk/libdvdcss/css.c Fri Aug 29 22:22:36 2008
@@ -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 at via.ecp.fr>
Modified: trunk/libdvdcss/device.h
==============================================================================
--- trunk/libdvdcss/device.h (original)
+++ trunk/libdvdcss/device.h Fri Aug 29 22:22:36 2008
@@ -5,7 +5,7 @@
* $Id$
*
* Authors: Stéphane Borel <stef at via.ecp.fr>
- * Samuel Hocevar <sam at zoy.org>
+ * Sam Hocevar <sam at zoy.org>
* Håkan Hjort <d95hjort at dtek.chalmers.se>
*
* This program is free software; you can redistribute it and/or modify
Modified: trunk/libdvdcss/dvdcss/dvdcss.h
==============================================================================
--- trunk/libdvdcss/dvdcss/dvdcss.h (original)
+++ trunk/libdvdcss/dvdcss/dvdcss.h Fri Aug 29 22:22:36 2008
@@ -1,7 +1,7 @@
/**
* \file dvdcss.h
* \author Stéphane Borel <stef at via.ecp.fr>
- * \author Samuel Hocevar <sam at zoy.org>
+ * \author Sam Hocevar <sam at 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
Modified: trunk/libdvdcss/error.c
==============================================================================
--- trunk/libdvdcss/error.c (original)
+++ trunk/libdvdcss/error.c Fri Aug 29 22:22:36 2008
@@ -4,7 +4,7 @@
* Copyright (C) 1998-2002 VideoLAN
* $Id$
*
- * Author: Samuel Hocevar <sam at zoy.org>
+ * Author: Sam Hocevar <sam at 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
Modified: trunk/libdvdcss/ioctl.c
==============================================================================
--- trunk/libdvdcss/ioctl.c (original)
+++ trunk/libdvdcss/ioctl.c Fri Aug 29 22:22:36 2008
@@ -5,7 +5,7 @@
* $Id$
*
* Authors: Markus Kuespert <ltlBeBoy at beosmail.com>
- * Samuel Hocevar <sam at zoy.org>
+ * Sam Hocevar <sam at zoy.org>
* Jon Lech Johansen <jon-vl at nanocrew.net>
* Håkan Hjort <d95hjort at dtek.chalmers.se>
* Eugenio Jarosiewicz <ej0 at cise.ufl.edu>
Modified: trunk/libdvdcss/ioctl.h
==============================================================================
--- trunk/libdvdcss/ioctl.h (original)
+++ trunk/libdvdcss/ioctl.h Fri Aug 29 22:22:36 2008
@@ -4,7 +4,7 @@
* Copyright (C) 1999-2001 VideoLAN
* $Id$
*
- * Authors: Samuel Hocevar <sam at zoy.org>
+ * Authors: Sam Hocevar <sam at 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
Modified: trunk/libdvdcss/libdvdcss.c
==============================================================================
--- trunk/libdvdcss/libdvdcss.c (original)
+++ trunk/libdvdcss/libdvdcss.c Fri Aug 29 22:22:36 2008
@@ -1,10 +1,10 @@
/* libdvdcss.c: DVD reading library.
*
* Authors: Stéphane Borel <stef at via.ecp.fr>
- * Samuel Hocevar <sam at zoy.org>
+ * Sam Hocevar <sam at zoy.org>
* Håkan Hjort <d95hjort at 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 (
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_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 (
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
{
return dvdcss->b_scrambled;
}
+
Modified: trunk/libdvdcss/libdvdcss.h
==============================================================================
--- trunk/libdvdcss/libdvdcss.h (original)
+++ trunk/libdvdcss/libdvdcss.h Fri Aug 29 22:22:36 2008
@@ -5,7 +5,7 @@
* $Id$
*
* Authors: Stéphane Borel <stef at via.ecp.fr>
- * Samuel Hocevar <sam at zoy.org>
+ * Sam Hocevar <sam at 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
More information about the MPlayer-cvslog
mailing list