[MPlayer-cvslog] r31155 - in trunk/libdvdcss: common.h css.c css.h csstables.h device.c device.h dvdcss/dvdcss.h error.c ioctl.c ioctl.h libdvdcss.c libdvdcss.h
diego
subversion at mplayerhq.hu
Tue May 11 12:51:47 CEST 2010
Author: diego
Date: Tue May 11 12:51:46 2010
New Revision: 31155
Log:
libdvdcss: cosmetics: Fix FSF address and program name in license headers.
This merges upstream revisions 219 and 221.
Modified:
trunk/libdvdcss/common.h
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/error.c
trunk/libdvdcss/ioctl.c
trunk/libdvdcss/ioctl.h
trunk/libdvdcss/libdvdcss.c
trunk/libdvdcss/libdvdcss.h
Modified: trunk/libdvdcss/common.h
==============================================================================
--- trunk/libdvdcss/common.h Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/common.h Tue May 11 12:51:46 2010 (r31155)
@@ -19,9 +19,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with libdvdcss; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
/*****************************************************************************
Modified: trunk/libdvdcss/css.c
==============================================================================
--- trunk/libdvdcss/css.c Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/css.c Tue May 11 12:51:46 2010 (r31155)
@@ -16,19 +16,19 @@
* - DecVOB
* see http://www.lemuria.org/DeCSS/ by Tom Vogt for more information.
*
- * This program is free software; you can redistribute it and/or modify
+ * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this library; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
/*****************************************************************************
Modified: trunk/libdvdcss/css.h
==============================================================================
--- trunk/libdvdcss/css.h Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/css.h Tue May 11 12:51:46 2010 (r31155)
@@ -22,9 +22,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with libdvdcss; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
#define KEY_SIZE 5
Modified: trunk/libdvdcss/csstables.h
==============================================================================
--- trunk/libdvdcss/csstables.h Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/csstables.h Tue May 11 12:51:46 2010 (r31155)
@@ -24,9 +24,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with libdvdcss; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
Modified: trunk/libdvdcss/device.c
==============================================================================
--- trunk/libdvdcss/device.c Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/device.c Tue May 11 12:51:46 2010 (r31155)
@@ -8,19 +8,19 @@
* Sam Hocevar <sam at zoy.org>
* Håkan Hjort <d95hjort at dtek.chalmers.se>
*
- * This program is free software; you can redistribute it and/or modify
+ * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this library; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
/*****************************************************************************
Modified: trunk/libdvdcss/device.h
==============================================================================
--- trunk/libdvdcss/device.h Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/device.h Tue May 11 12:51:46 2010 (r31155)
@@ -18,9 +18,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with libdvdcss; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
/*****************************************************************************
Modified: trunk/libdvdcss/dvdcss/dvdcss.h
==============================================================================
--- trunk/libdvdcss/dvdcss/dvdcss.h Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/dvdcss/dvdcss.h Tue May 11 12:51:46 2010 (r31155)
@@ -22,9 +22,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with libdvdcss; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef DVDCSS_DVDCSS_H
Modified: trunk/libdvdcss/error.c
==============================================================================
--- trunk/libdvdcss/error.c Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/error.c Tue May 11 12:51:46 2010 (r31155)
@@ -6,19 +6,19 @@
*
* Author: Sam Hocevar <sam at zoy.org>
*
- * This program is free software; you can redistribute it and/or modify
+ * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this library; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
#include "config.h"
Modified: trunk/libdvdcss/ioctl.c
==============================================================================
--- trunk/libdvdcss/ioctl.c Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/ioctl.c Tue May 11 12:51:46 2010 (r31155)
@@ -13,19 +13,19 @@
* Alex Strelnikov <lelik at os2.ru>
* Gildas Bazin <gbazin at netcourrier.com>
*
- * This program is free software; you can redistribute it and/or modify
+ * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this library; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
/*****************************************************************************
Modified: trunk/libdvdcss/ioctl.h
==============================================================================
--- trunk/libdvdcss/ioctl.h Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/ioctl.h Tue May 11 12:51:46 2010 (r31155)
@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with libdvdcss; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
int ioctl_ReadCopyright ( int, int, int * );
Modified: trunk/libdvdcss/libdvdcss.c
==============================================================================
--- trunk/libdvdcss/libdvdcss.c Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/libdvdcss.c Tue May 11 12:51:46 2010 (r31155)
@@ -7,19 +7,19 @@
* Copyright (C) 1998-2008 VideoLAN
* $Id$
*
- * This program is free software; you can redistribute it and/or modify
+ * This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this library; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
Modified: trunk/libdvdcss/libdvdcss.h
==============================================================================
--- trunk/libdvdcss/libdvdcss.h Tue May 11 11:23:31 2010 (r31154)
+++ trunk/libdvdcss/libdvdcss.h Tue May 11 12:51:46 2010 (r31155)
@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with libdvdcss; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
struct iovec;
More information about the MPlayer-cvslog
mailing list