From 4ca1fa0a0835d511167017a2621a085076d9fdfa Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 15 Sep 2008 05:40:29 +0000 Subject: Upgrade license of LGPL 2 or later files to LGPL 2.1 or later. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27614 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/dvd2divxscript.pl | 2 +- libmpdemux/demux_avs.c | 19 ++++++++++--------- libmpdemux/demux_avs.h | 19 ++++++++++--------- libvo/vo_dfbmga.c | 43 +++++++++++++++++++++---------------------- libvo/vo_directfb2.c | 43 ++++++++++++++++++++++--------------------- libvo/vo_gif89a.c | 43 +++++++++++++++++++++---------------------- libvo/vo_quartz.h | 8 ++++---- 7 files changed, 89 insertions(+), 88 deletions(-) diff --git a/TOOLS/dvd2divxscript.pl b/TOOLS/dvd2divxscript.pl index eaf55bd7e7..3c9203905c 100755 --- a/TOOLS/dvd2divxscript.pl +++ b/TOOLS/dvd2divxscript.pl @@ -15,7 +15,7 @@ # This script is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# version 2.1 of the License, or (at your option) any later version. # # This script is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index 2f8ec46bde..8d2ac82046 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -2,20 +2,21 @@ * Demuxer for avisynth * Copyright (c) 2005 Gianluigi Tiesi * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * MPlayer 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 - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library 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. + * You should have received a copy of the GNU Lesser General Public License + * along with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include diff --git a/libmpdemux/demux_avs.h b/libmpdemux/demux_avs.h index 0962146281..708ce9c70a 100644 --- a/libmpdemux/demux_avs.h +++ b/libmpdemux/demux_avs.h @@ -5,20 +5,21 @@ * Avisynth C Interface Version 0.20 * Copyright 2003 Kevin Atkinson * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * MPlayer 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 - * Library General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library 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. + * You should have received a copy of the GNU Lesser General Public License + * along with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef MPLAYER_DEMUX_AVS_H diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c index af1e89105e..3c22145517 100644 --- a/libvo/vo_dfbmga.c +++ b/libvo/vo_dfbmga.c @@ -1,26 +1,25 @@ /* - MPlayer video driver for DirectFB / Matrox G200/G400/G450/G550 - - Copyright (C) 2002-2005 Ville Syrjala - - Originally based on vo_directfb.c by - Jiri Svoboda - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser 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. -*/ + * MPlayer video driver for DirectFB / Matrox G200/G400/G450/G550 + * + * copyright (C) 2002-2005 Ville Syrjala + * Originally based on vo_directfb.c by Jiri Svoboda . + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * MPlayer 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ /* directfb includes */ #include diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index 86dbc9b0d2..133f46a07e 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -1,25 +1,26 @@ /* - MPlayer video driver for DirectFramebuffer device - - (C) 2002 - - Written by Jiri Svoboda - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser 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. -*/ + * MPlayer video driver for DirectFramebuffer device + * + * copyright (C) 2002 Jiri Svoboda + * + * based on vo_directfb2.c + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * MPlayer 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ // directfb includes diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c index e3e1d6ac95..5e59a3dcef 100644 --- a/libvo/vo_gif89a.c +++ b/libvo/vo_gif89a.c @@ -1,26 +1,25 @@ /* - MPlayer video driver for animated gif output - - (C) 2002 - - Written by Joey Parrish - Based on vo_directfb2.c - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser 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. -*/ + * MPlayer video driver for animated GIF output + * + * copyright (C) 2002 Joey Parrish + * based on vo_directfb2.c + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * MPlayer 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ /* Notes: * when setting output framerate, frames will be ignored as needed diff --git a/libvo/vo_quartz.h b/libvo/vo_quartz.h index b0e8fece46..82eb096ba0 100644 --- a/libvo/vo_quartz.h +++ b/libvo/vo_quartz.h @@ -9,16 +9,16 @@ Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public + modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. 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 - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public + You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- cgit v1.2.3