Mercurial > mplayer.hg
changeset 30159:fc7947d21c0a
Clarify which version of the GPL applies to MPlayer.
| author | diego |
|---|---|
| date | Mon, 04 Jan 2010 13:01:44 +0000 |
| parents | 9c96c5a55b3e |
| children | f91c628dc701 |
| files | Copyright |
| diffstat | 1 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Copyright Mon Jan 04 12:24:07 2010 +0000 +++ b/Copyright Mon Jan 04 13:01:44 2010 +0000 @@ -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