RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-29 19:22:48 +00:00
Code Issues Releases Wiki Activity

Sync libdvdcss with upstream version r212.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27474 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-08-21 13:40:16 +00:00
parent e9e576a0a6
commit c2a12149e2
10 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Copyright
View File

@ -42,7 +42,7 @@ Copyright: 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
License: GNU General Public License
Name: libdvdcss
Version: Subversion r208 (post 1.2.9 release)
Version: Subversion r212 (post 1.2.9 release)
Homepage: http://developers.videolan.org/libdvdcss/
Directory: libdvdcss
Copyright: 1998-2006 VideoLAN

5
libdvdcss/css.c
View File

@ -4,8 +4,8 @@
* Copyright (C) 1999-2003 VideoLAN
* $Id$
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
*
* based on:
* - css-auth by Derek Fawcus <derek@spider.com>
@ -325,6 +325,7 @@ int _dvdcss_disckey( dvdcss_t dvdcss )
"cracking title keys instead" );
/* Fallback, but not to DISC as the disc key might be faulty */
memset( p_disc_key, 0, KEY_SIZE );
dvdcss->i_method = DVDCSS_METHOD_TITLE;
break;

2
libdvdcss/css.h
View File

@ -4,7 +4,7 @@
* Copyright (C) 1999-2001 VideoLAN
* $Id$
*
* Author: Stéphane Borel <stef@via.ecp.fr>
* Author: Stéphane Borel <stef@via.ecp.fr>
*
* based on:
* - css-auth by Derek Fawcus <derek@spider.com>

2
libdvdcss/csstables.h
View File

@ -4,7 +4,7 @@
* Copyright (C) 1999-2001 VideoLAN
* $Id$
*
* Author: Stéphane Borel <stef@via.ecp.fr>
* Author: Stéphane Borel <stef@via.ecp.fr>
*
* based on:
* - css-auth by Derek Fawcus <derek@spider.com>

4
libdvdcss/device.c
View File

@ -4,9 +4,9 @@
* Copyright (C) 1998-2006 VideoLAN
* $Id$
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Sam Hocevar <sam@zoy.org>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
*
* 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

4
libdvdcss/device.h
View File

@ -4,9 +4,9 @@
* Copyright (C) 1998-2002 VideoLAN
* $Id$
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
*
* 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

4
libdvdcss/dvdcss/dvdcss.h
View File

@ -1,6 +1,6 @@
/**
* \file dvdcss.h
* \author Stéphane Borel <stef@via.ecp.fr>
* \author Stéphane Borel <stef@via.ecp.fr>
* \author Samuel Hocevar <sam@zoy.org>
* \brief The \e libdvdcss public header.
*
@ -88,6 +88,8 @@ LIBDVDCSS_EXPORT int dvdcss_readv ( dvdcss_t,
int i_flags );
LIBDVDCSS_EXPORT char * dvdcss_error ( dvdcss_t );
LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t );
/*
* Deprecated stuff.

4
libdvdcss/ioctl.c
View File

@ -7,9 +7,9 @@
* Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
* Samuel Hocevar <sam@zoy.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
* Eugenio Jarosiewicz <ej0@cise.ufl.edu>
* David Siebörger <drs-videolan@rucus.ru.ac.za>
* David Siebörger <drs-videolan@rucus.ru.ac.za>
* Alex Strelnikov <lelik@os2.ru>
* Gildas Bazin <gbazin@netcourrier.com>
*

20
libdvdcss/libdvdcss.c
View File

@ -1,8 +1,8 @@
/* libdvdcss.c: DVD reading library.
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
* Håkan Hjort <d95hjort@dtek.chalmers.se>
*
* Copyright (C) 1998-2002 VideoLAN
* $Id$
@ -375,6 +375,10 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target )
"could not get disc key" );
}
}
else
{
memset( dvdcss->css.p_disc_key, 0, KEY_SIZE );
}
/* If the cache is enabled, write the cache directory tag */
if( psz_cache )
@ -793,3 +797,15 @@ LIBDVDCSS_EXPORT int dvdcss_title ( dvdcss_t dvdcss, int i_block )
return _dvdcss_title( dvdcss, i_block );
}
/**
* \brief Return 1 if the DVD is scrambled, 0 otherwise.
*
* \param dvdcss a \e libdvdcss instance.
* \return 1 if the DVD is scrambled, 0 otherwise.
*
* This function returns whether the DVD is scrambled.
*/
LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t dvdcss )
{
return dvdcss->b_scrambled;
}

2
libdvdcss/libdvdcss.h
View File

@ -4,7 +4,7 @@
* Copyright (C) 1998-2001 VideoLAN
* $Id$
*
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Authors: Stéphane Borel <stef@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify