[MPlayer-cvslog] 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

[The Wanderer]

Ivan Kalvachev wrote:

> On 8/21/08, diego <subversion at 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 at via.ecp.fr>
>> - *          Håkan Hjort <d95hjort at dtek.chalmers.se>
>> + * Authors: Stéphane Borel <stef at via.ecp.fr>
>> + *          Håkan Hjort <d95hjort at dtek.chalmers.se>
>>   *
>>   * based on:
>>   *  - css-auth by Derek Fawcus <derek at 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.