Mercurial > mplayer.hg
changeset 27442:afa2cc0166be
Sync libdvdcss with upstream version r212.
| author | diego |
|---|---|
| date | Thu, 21 Aug 2008 13:40:16 +0000 |
| parents | 8e8992737a19 |
| children | ff52998e24e8 |
| files | Copyright libdvdcss/css.c libdvdcss/css.h libdvdcss/csstables.h libdvdcss/device.c libdvdcss/device.h libdvdcss/dvdcss/dvdcss.h libdvdcss/ioctl.c libdvdcss/libdvdcss.c libdvdcss/libdvdcss.h |
| diffstat | 10 files changed, 34 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/Copyright Thu Aug 21 11:00:47 2008 +0000 +++ b/Copyright Thu Aug 21 13:40:16 2008 +0000 @@ -42,7 +42,7 @@ 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
--- a/libdvdcss/css.c Thu Aug 21 11:00:47 2008 +0000 +++ b/libdvdcss/css.c Thu Aug 21 13:40:16 2008 +0000 @@ -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 @@ "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;
--- a/libdvdcss/css.h Thu Aug 21 11:00:47 2008 +0000 +++ b/libdvdcss/css.h Thu Aug 21 13:40:16 2008 +0000 @@ -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>
--- a/libdvdcss/csstables.h Thu Aug 21 11:00:47 2008 +0000 +++ b/libdvdcss/csstables.h Thu Aug 21 13:40:16 2008 +0000 @@ -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>
--- a/libdvdcss/device.c Thu Aug 21 11:00:47 2008 +0000 +++ b/libdvdcss/device.c Thu Aug 21 13:40:16 2008 +0000 @@ -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
--- a/libdvdcss/device.h Thu Aug 21 11:00:47 2008 +0000 +++ b/libdvdcss/device.h Thu Aug 21 13:40:16 2008 +0000 @@ -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
--- a/libdvdcss/dvdcss/dvdcss.h Thu Aug 21 11:00:47 2008 +0000 +++ b/libdvdcss/dvdcss/dvdcss.h Thu Aug 21 13:40:16 2008 +0000 @@ -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 @@ int i_flags ); LIBDVDCSS_EXPORT char * dvdcss_error ( dvdcss_t ); +LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t ); + /* * Deprecated stuff.
--- a/libdvdcss/ioctl.c Thu Aug 21 11:00:47 2008 +0000 +++ b/libdvdcss/ioctl.c Thu Aug 21 13:40:16 2008 +0000 @@ -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> *
--- a/libdvdcss/libdvdcss.c Thu Aug 21 11:00:47 2008 +0000 +++ b/libdvdcss/libdvdcss.c Thu Aug 21 13:40:16 2008 +0000 @@ -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 @@ "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 @@ 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; +}
--- a/libdvdcss/libdvdcss.h Thu Aug 21 11:00:47 2008 +0000 +++ b/libdvdcss/libdvdcss.h Thu Aug 21 13:40:16 2008 +0000 @@ -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