Mercurial > mplayer.hg
changeset 31098:9e9595c779cf
libdvdcss: cosmetics: Fix FSF address and program name in license headers.
This merges upstream revisions 219 and 221.
| author | diego |
|---|---|
| date | Tue, 11 May 2010 10:51:46 +0000 |
| parents | 5b23259d86e7 |
| children | f43e87f69590 |
| files | libdvdcss/common.h libdvdcss/css.c libdvdcss/css.h libdvdcss/csstables.h libdvdcss/device.c libdvdcss/device.h libdvdcss/dvdcss/dvdcss.h libdvdcss/error.c libdvdcss/ioctl.c libdvdcss/ioctl.h libdvdcss/libdvdcss.c libdvdcss/libdvdcss.h |
| diffstat | 12 files changed, 46 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/libdvdcss/common.h Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/common.h Tue May 11 10:51:46 2010 +0000 @@ -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. *****************************************************************************/ /*****************************************************************************
--- a/libdvdcss/css.c Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/css.c Tue May 11 10:51:46 2010 +0000 @@ -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. *****************************************************************************/ /*****************************************************************************
--- a/libdvdcss/css.h Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/css.h Tue May 11 10:51:46 2010 +0000 @@ -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
--- a/libdvdcss/csstables.h Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/csstables.h Tue May 11 10:51:46 2010 +0000 @@ -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. *****************************************************************************/
--- a/libdvdcss/device.c Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/device.c Tue May 11 10:51:46 2010 +0000 @@ -8,19 +8,19 @@ * Sam Hocevar <sam@zoy.org> * Håkan Hjort <d95hjort@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. *****************************************************************************/ /*****************************************************************************
--- a/libdvdcss/device.h Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/device.h Tue May 11 10:51:46 2010 +0000 @@ -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. *****************************************************************************/ /*****************************************************************************
--- a/libdvdcss/dvdcss/dvdcss.h Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/dvdcss/dvdcss.h Tue May 11 10:51:46 2010 +0000 @@ -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
--- a/libdvdcss/error.c Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/error.c Tue May 11 10:51:46 2010 +0000 @@ -6,19 +6,19 @@ * * Author: Sam Hocevar <sam@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"
--- a/libdvdcss/ioctl.c Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/ioctl.c Tue May 11 10:51:46 2010 +0000 @@ -13,19 +13,19 @@ * Alex Strelnikov <lelik@os2.ru> * Gildas Bazin <gbazin@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. *****************************************************************************/ /*****************************************************************************
--- a/libdvdcss/ioctl.h Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/ioctl.h Tue May 11 10:51:46 2010 +0000 @@ -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 * );
--- a/libdvdcss/libdvdcss.c Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/libdvdcss.c Tue May 11 10:51:46 2010 +0000 @@ -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. */ /**
--- a/libdvdcss/libdvdcss.h Tue May 11 09:23:31 2010 +0000 +++ b/libdvdcss/libdvdcss.h Tue May 11 10:51:46 2010 +0000 @@ -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;