[MPlayer-cvslog] CVS: main/libmpdvdkit2 libdvdcss_changes.diff, 1.1, 1.2
Diego Biurrun CVS
syncmail at mplayerhq.hu
Tue Mar 22 23:35:06 CET 2005
CVS change done by Diego Biurrun CVS
Update of /cvsroot/mplayer/main/libmpdvdkit2
In directory mail:/var2/tmp/cvs-serv31723
Modified Files:
libdvdcss_changes.diff
Log Message:
Remove the MPlayer-specific copyright notices. The diff would not apply
cleanly anyway due to $Id$ expansion shenanigans that are a royal PITA to
circumvent.
Index: libdvdcss_changes.diff
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit2/libdvdcss_changes.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdvdcss_changes.diff 1 Mar 2005 06:58:15 -0000 1.1
+++ libdvdcss_changes.diff 22 Mar 2005 22:35:03 -0000 1.2
@@ -1,16 +1,5 @@
--- bsdi_ioctl.c 2003-03-10 00:34:10.000000000 +0100
+++ bsdi_ioctl.c 2005-03-01 07:41:41.000000000 +0100
-@@ -4,6 +4,10 @@
- * Hacked version of the linux cdrom.c kernel module - everything except the
- * DVD handling ripped out and the rest rewritten to use raw SCSI commands
- * on BSD/OS 4.2 (but should work with earlier versions as well).
-+ *
-+ * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff.
-+ * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
-+ * $Id$
- */
-
- #include <sys/types.h>
@@ -694,7 +698,7 @@
struct cdrom_tocentry entry;
int ret, i;
@@ -22,18 +11,6 @@
* This whole business is a crock anyhow so we don't bother distinguishing
--- common.h 2003-06-13 19:33:35.000000000 +0200
+++ common.h 2005-03-01 07:41:41.000000000 +0100
-@@ -3,7 +3,10 @@
- * Collection of useful common types and macros definitions
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
-- * $Id$
-+ *
-+ * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff.
-+ * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
-+ * $Id$
- *
- * Authors: Samuel Hocevar <sam at via.ecp.fr>
- * Vincent Seguin <seguin at via.ecp.fr>
@@ -27,21 +30,10 @@
/*****************************************************************************
* Basic types definitions
@@ -62,18 +39,6 @@
#if defined( WIN32 )
--- css.c 2003-07-29 01:37:06.000000000 +0200
+++ css.c 2005-03-01 07:41:41.000000000 +0100
-@@ -2,7 +2,10 @@
- * css.c: Functions for DVD authentication and descrambling
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-- * $Id$
-+ *
-+ * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff.
-+ * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
-+ * $Id$
- *
- * Author: Stéphane Borel <stef at via.ecp.fr>
- * Håkan Hjort <d95hjort at dtek.chalmers.se>
@@ -40,19 +43,11 @@
#include <string.h>
#include <sys/types.h>
@@ -99,18 +64,6 @@
#include "css.h"
--- device.c 2003-07-29 01:37:06.000000000 +0200
+++ device.c 2005-03-01 07:41:41.000000000 +0100
-@@ -2,7 +2,10 @@
- * device.h: DVD device access
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-- * $Id$
-+ *
-+ * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff.
-+ * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
-+ * $Id$
- *
- * Authors: Stéphane Borel <stef at via.ecp.fr>
- * Samuel Hocevar <sam at zoy.org>
@@ -33,18 +36,9 @@
#include <string.h>
#include <sys/types.h>
@@ -157,18 +110,6 @@
dvdcss->p_readv_buffer = NULL;
--- error.c 2003-03-10 01:15:31.000000000 +0100
+++ error.c 2005-03-01 07:41:41.000000000 +0100
-@@ -2,7 +2,10 @@
- * error.c: error management functions
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-- * $Id$
-+ *
-+ * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff.
-+ * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
-+ * $Id$
- *
- * Author: Samuel Hocevar <sam at zoy.org>
- *
@@ -25,16 +28,9 @@
#include <stdio.h>
@@ -190,18 +131,6 @@
#include "css.h"
--- ioctl.c 2003-03-10 00:34:10.000000000 +0100
+++ ioctl.c 2005-03-01 07:41:41.000000000 +0100
-@@ -2,7 +2,10 @@
- * ioctl.c: DVD ioctl replacement function
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-- * $Id$
-+ *
-+ * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff.
-+ * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
-+ * $Id$
- *
- * Authors: Markus Kuespert <ltlBeBoy at beosmail.com>
- * Samuel Hocevar <sam at zoy.org>
@@ -76,6 +79,7 @@
# include <sys/scsi.h>
#endif
@@ -383,18 +312,6 @@
#if defined( WIN32 )
--- libdvdcss.c 2003-06-22 16:08:53.000000000 +0200
+++ libdvdcss.c 2005-03-01 07:41:41.000000000 +0100
-@@ -5,7 +5,10 @@
- * Håkan Hjort <d95hjort at dtek.chalmers.se>
- *
- * Copyright (C) 1998-2002 VideoLAN
-- * $Id$
-+ *
-+ * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff.
-+ * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
-+ * $Id$
- *
- * 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
@@ -22,7 +25,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
@@ -573,18 +490,6 @@
#else
--- dvdcss/dvdcss.h 2003-04-18 20:05:36.000000000 +0200
+++ dvdcss.h 2005-03-01 07:41:41.000000000 +0100
-@@ -10,7 +10,10 @@
-
- /*
- * Copyright (C) 1998-2002 VideoLAN
-- * $Id$
-+ *
-+ * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff.
-+ * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
-+ * $Id$
- *
- * 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
@@ -67,6 +70,8 @@
*/
extern dvdcss_t dvdcss_open ( char *psz_target );
More information about the MPlayer-cvslog
mailing list