RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Sync libdvdcss with upstream version 1.2.10. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27494 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-08-29 20:22:36 +00:00
parent 3af860b877
commit e915d29f0a
11 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog
View File

@ -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

4
Copyright
View File

@ -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

2
libdvdcss/common.h
View File

@ -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>
*

2
libdvdcss/css.c
View File

@ -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>

2
libdvdcss/device.h
View File

@ -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

4
libdvdcss/dvdcss/dvdcss.h
View File

@ -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

2
libdvdcss/error.c
View File

@ -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

2
libdvdcss/ioctl.c
View File

@ -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>

2
libdvdcss/ioctl.h
View File

@ -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

12
libdvdcss/libdvdcss.c
View File

@ -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;
}

2
libdvdcss/libdvdcss.h
View File

@ -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