From b1037d87ee9d0517163b22c231ff54e7d0ae33a6 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Jan 2010 13:01:44 +0000 Subject: Clarify which version of the GPL applies to MPlayer. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30201 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Copyright | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'Copyright') diff --git a/Copyright b/Copyright index 8d45d26b1a..7a1485a720 100644 --- a/Copyright +++ b/Copyright @@ -1,11 +1,16 @@ MPlayer was originally written by Árpád Gereöffy and has been extended and worked on by many more since then, see the AUTHORS file for an (incomplete) -list. You are free to use it under the terms of the GNU General Public License, -as described in the LICENSE file. +list. MPlayer as a whole is copyrighted by the MPlayer team. Individual +copyright notices can be found in file headers. -MPlayer as a whole is copyrighted by the MPlayer team. Individual copyright -notices can be found in the file headers. Furthermore, MPlayer includes code -from several external sources: +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. + +MPlayer includes code from several external sources. General information and +license details are listed below: Name: FFmpeg Version: Subversion HEAD -- cgit v1.2.3