From 17528080d6068fab2e52af12d7706ce58bdf3922 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 24 Mar 2011 23:11:32 +0200 Subject: Copyright, LICENSE: change binary license to GPL 3 Change license indicated for compiled binaries to GPL 3 to match talloc.c which is LGPL 3+. Note that at least for now the source licenses have NOT been changed - almost everything is still GPL 2+ or compatible, not GPL 3+. --- Copyright | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Copyright') diff --git a/Copyright b/Copyright index 1da06aedf6..def4bf611c 100644 --- a/Copyright +++ b/Copyright @@ -4,10 +4,11 @@ list. MPlayer as a whole is copyrighted by the MPlayer team. Individual copyright notices can be found in file headers. Most files in MPlayer are licensed under the GNU General Public License, -version 2 with an explicit "or later" clause or a compatible license. An -exception is the file libmpdemux/demux_ty_osd.c, which is version 2 only. -Thus MPlayer as a whole can be redistributed under the terms of the GNU -General Public License, version 2, see the LICENSE file for details. +version 2 with an explicit "or later" clause or a compatible license +(LGPL 2.1+, MIT/BSD). An exception are the files talloc.c and talloc.h, +which are LGPL 3+. +Thus MPlayer as a whole can be redistributed under terms compatible with +the GNU General Public License, version 3; see the LICENSE file for details. MPlayer includes code from several external sources. General information and license details are listed below: -- cgit v1.2.3