r27474 - in trunk: 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
Author: diego Date: Thu Aug 21 15:40:16 2008 New Revision: 27474 Log: Sync libdvdcss with upstream version r212. Modified: trunk/Copyright trunk/libdvdcss/css.c trunk/libdvdcss/css.h trunk/libdvdcss/csstables.h trunk/libdvdcss/device.c trunk/libdvdcss/device.h trunk/libdvdcss/dvdcss/dvdcss.h trunk/libdvdcss/ioctl.c trunk/libdvdcss/libdvdcss.c trunk/libdvdcss/libdvdcss.h Modified: trunk/Copyright ============================================================================== --- trunk/Copyright (original) +++ trunk/Copyright Thu Aug 21 15:40:16 2008 @@ -42,7 +42,7 @@ Copyright: 1999-2000 Aaron Holtzman <ah 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 Modified: trunk/libdvdcss/css.c ============================================================================== --- trunk/libdvdcss/css.c (original) +++ trunk/libdvdcss/css.c Thu Aug 21 15:40:16 2008 @@ -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; Modified: trunk/libdvdcss/css.h ============================================================================== --- trunk/libdvdcss/css.h (original) +++ trunk/libdvdcss/css.h Thu Aug 21 15:40:16 2008 @@ -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> Modified: trunk/libdvdcss/csstables.h ============================================================================== --- trunk/libdvdcss/csstables.h (original) +++ trunk/libdvdcss/csstables.h Thu Aug 21 15:40:16 2008 @@ -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> Modified: trunk/libdvdcss/device.c ============================================================================== --- trunk/libdvdcss/device.c (original) +++ trunk/libdvdcss/device.c Thu Aug 21 15:40:16 2008 @@ -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 Modified: trunk/libdvdcss/device.h ============================================================================== --- trunk/libdvdcss/device.h (original) +++ trunk/libdvdcss/device.h Thu Aug 21 15:40:16 2008 @@ -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 Modified: trunk/libdvdcss/dvdcss/dvdcss.h ============================================================================== --- trunk/libdvdcss/dvdcss/dvdcss.h (original) +++ trunk/libdvdcss/dvdcss/dvdcss.h Thu Aug 21 15:40:16 2008 @@ -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 ( int i_flags ); LIBDVDCSS_EXPORT char * dvdcss_error ( dvdcss_t ); +LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t ); + /* * Deprecated stuff. Modified: trunk/libdvdcss/ioctl.c ============================================================================== --- trunk/libdvdcss/ioctl.c (original) +++ trunk/libdvdcss/ioctl.c Thu Aug 21 15:40:16 2008 @@ -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> * Modified: trunk/libdvdcss/libdvdcss.c ============================================================================== --- trunk/libdvdcss/libdvdcss.c (original) +++ trunk/libdvdcss/libdvdcss.c Thu Aug 21 15:40:16 2008 @@ -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 ( "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 ( dvdc 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; +} Modified: trunk/libdvdcss/libdvdcss.h ============================================================================== --- trunk/libdvdcss/libdvdcss.h (original) +++ trunk/libdvdcss/libdvdcss.h Thu Aug 21 15:40:16 2008 @@ -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
On 8/21/08, diego <subversion@mplayerhq.hu> wrote:
Author: diego Date: Thu Aug 21 15:40:16 2008 New Revision: 27474
Log: Sync libdvdcss with upstream version r212. ... --- trunk/libdvdcss/css.c (original) +++ trunk/libdvdcss/css.c Thu Aug 21 15:40:16 2008 @@ -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;
Mixing cosmetic with functional changes.
Ivan Kalvachev wrote:
On 8/21/08, diego <subversion@mplayerhq.hu> wrote:
Author: diego Date: Thu Aug 21 15:40:16 2008 New Revision: 27474
Log: Sync libdvdcss with upstream version r212. ... --- trunk/libdvdcss/css.c (original) +++ trunk/libdvdcss/css.c Thu Aug 21 15:40:16 2008 @@ -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;
Mixing cosmetic with functional changes.
I believe there's precedent for that being considered acceptable in the case of "sync with upstream" patches. -- The Wanderer Warning: Simply because I argue an issue does not mean I agree with any side of it. Secrecy is the beginning of tyranny.
On 8/22/08, The Wanderer <inverseparadox@comcast.net> wrote:
Ivan Kalvachev wrote:
On 8/21/08, diego <subversion@mplayerhq.hu> wrote:
Author: diego Date: Thu Aug 21 15:40:16 2008 New Revision: 27474
Log: Sync libdvdcss with upstream version r212. ... --- trunk/libdvdcss/css.c (original) +++ trunk/libdvdcss/css.c Thu Aug 21 15:40:16 2008 @@ -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;
Mixing cosmetic with functional changes.
I believe there's precedent for that being considered acceptable in the case of "sync with upstream" patches.
Please, be so kind to find it. All I was able to find were commits r20431 and r20433/4 who are clear precedent for the opposite. Having bonus of touching the same area. The reasons for splitting cosmetics and functional changes are still valid even when the changes are coming from upstream.
On Fri, Aug 22, 2008 at 01:51:31PM +0300, Ivan Kalvachev wrote:
On 8/22/08, The Wanderer <inverseparadox@comcast.net> wrote:
Ivan Kalvachev wrote:
On 8/21/08, diego <subversion@mplayerhq.hu> wrote:
Author: diego Date: Thu Aug 21 15:40:16 2008 New Revision: 27474
Log: Sync libdvdcss with upstream version r212. ... --- trunk/libdvdcss/css.c (original) +++ trunk/libdvdcss/css.c Thu Aug 21 15:40:16 2008 @@ -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;
Mixing cosmetic with functional changes.
I believe there's precedent for that being considered acceptable in the case of "sync with upstream" patches.
Please, be so kind to find it.
All I was able to find were commits r20431 and r20433/4 who are clear precedent for the opposite. Having bonus of touching the same area.
The vidix update stuff was never split, and was far, far, far more problematic.
The reasons for splitting cosmetics and functional changes are still valid even when the changes are coming from upstream.
Yes, but there they are an immense effort that can not be avoided by creating the patches properly in the first place since that is out of our control, as is the final result.
On 8/22/08, Reimar Doeffinger <Reimar.Doeffinger@stud.uni-karlsruhe.de> wrote:
On Fri, Aug 22, 2008 at 01:51:31PM +0300, Ivan Kalvachev wrote:
On 8/22/08, The Wanderer <inverseparadox@comcast.net> wrote:
Ivan Kalvachev wrote:
On 8/21/08, diego <subversion@mplayerhq.hu> wrote:
Author: diego Date: Thu Aug 21 15:40:16 2008 New Revision: 27474
Log: Sync libdvdcss with upstream version r212. ... --- trunk/libdvdcss/css.c (original) +++ trunk/libdvdcss/css.c Thu Aug 21 15:40:16 2008 @@ -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;
Mixing cosmetic with functional changes.
I believe there's precedent for that being considered acceptable in the case of "sync with upstream" patches.
Please, be so kind to find it.
All I was able to find were commits r20431 and r20433/4 who are clear precedent for the opposite. Having bonus of touching the same area.
The vidix update stuff was never split, and was far, far, far more problematic.
Would you be more specific? e.g. revision number. I tried but couldn't find it.
The reasons for splitting cosmetics and functional changes are still valid
even when the changes are coming from upstream.
Yes, but there they are an immense effort that can not be avoided by creating the patches properly in the first place since that is out of our control, as is the final result.
Not in this case. I can understand if he commit code that changes indentation, variables, etc, but here we have quite distinct changes e.g. author name spelling in the credits.
participants (4)
-
diego -
Ivan Kalvachev -
Reimar Doeffinger -
The Wanderer