diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-03-24 23:11:32 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-03-24 23:40:29 +0200 |
| commit | 17528080d6068fab2e52af12d7706ce58bdf3922 (patch) | |
| tree | 996995756120bc8c5aaf8701afb9794375666ff7 /Copyright | |
| parent | 85f4633796c5c74d32d6824987dadbd309c66833 (diff) | |
| download | mpv-17528080d6068fab2e52af12d7706ce58bdf3922.tar.bz2 mpv-17528080d6068fab2e52af12d7706ce58bdf3922.tar.xz | |
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+.
Diffstat (limited to 'Copyright')
| -rw-r--r-- | Copyright | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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: |