Commit Graph

85 Commits

Author SHA1 Message Date
wm4 b537b59e65 msg.c/h: partially change license to LGPL
msg.c is "partial" due to "michael", whose work can be changed to LGPL
only once the core is LGPL. It's explained in the Copyright file. I
prefer to do the relicensing incrementally (due to the overwhelming
workload). Changing the license before that happens would be legally
questionable, but nothing can stop us from essentially marking it as
"will be LGPL".

All authors have agreed to LGPL, with the following exceptions:

9df11ee8bf: the author (probably) didn't agree, but the line that is
added is later fully removed.

35e90f1556: was not asked, but all iconv code was 100% removed from the
mp_msg mechanism (we alwas require UTF-8 now).

4e4f3f806e: the change by michael.

50a86fcc34: the identify variable was move, and completely removed the
latest in commit 48bd03dd91.

1f6c494641: did not agree, but due to a major mp_msg change the added
line became unnecessary and was removed.

da63498bf9: was not reachable, but the MPlayer GUI is gone from mpv
anyway (also commit fc4d6e617d removed these specific additions a long
time ago).
2017-05-05 06:53:23 +02:00
wm4 591d99a988 Copyright: change osd font license to LGPL
All controbutors have agreed. In one case, someone who is unaccounted
for changed a glyph in some trivial way; we simply replaced the glyph
with another one in 1e4d3a2440 to avoid any potential problems
(although that change was probably not copyrightable anyway).
2017-04-21 13:37:33 +02:00
wm4 636675ece8 Copyright: version.sh is GPL 2017-03-13 14:08:31 +01:00
wm4 b304d89e36 Copyright: list specific exceptions to stated rules
The "Files without Copyright notice are licensed as LGPLv2.1+."
statement makes it sound like the manpage and some other stuff are LGPL.
But the rule actually affects only some source files that were added in
mpv.

Change the wording, and also explicitly list the licenses for some non
source files. There might be more such cases.
2017-02-16 11:43:02 +01:00
Bin Jin 61bc96518a vo_opengl: remove nnedi3 prescaler 2016-06-18 19:16:27 +02:00
wm4 17507b5935 vo_opengl: require --enable-gpl3 for nnedi
There are claims that nnedi3.c doesn't constitute its own new
implementation, but is derived from existing HLSL or OpenCL shaders
distributed under the LGPLv3 license.

Until these are resolved, do the "correct" thing and require
--enable-gpl3 to build nnedi.
2015-12-03 09:32:40 +01:00
wm4 77a9265561 Copyright: mention that more liberal licenses are ok too
In fact, some source files do this.
2015-07-26 21:44:57 +02:00
wm4 95b930f866 Require contributions in LGPLv2.1+
As suggested in #2033.

Additionally, change "LGPLv2+" to "LGPLv2.1+". Since this was always
used with the "and later" phrase, this doesn't require any further
discussion.

Also clarify that the "+" means "or later". This should be clear to
anyone with a brain, but you never know with copyright.
2015-07-24 23:54:51 +02:00
wm4 a550731209 Copyright, LICENSE: switch to GPL version 2 or later
Now that talloc has been removed, the license can be switched back to
GPLv2+. Actually, there never was a GPLv2+ licensed MPlayer (fork or
not) until now, but removal of some GPLv2-only code makes this possible
now. Rewrite the Copyright file to explain the reasons for the licenses
MPlayer and forks use. The old Copyright file didn't contain anything
interesting anymore, and all information it contained is available at
other places in the source tree.

The reason for the license change itself is that it should improve
interoperability with differently licensed code in general.

This essentially reverts commit 1752808.
2013-10-13 01:36:10 +02:00
wm4 9488d312c1 Remove completely outdated AUTHORS file
Considering that we use version control, maintaining an AUTHORS file
doesn't make much sense, and indeed it was barely touched since the time
mplayer2 forked from MPlayer. None of the contributors to mplayer2 or
mpv are listed in this file (even uau's work is not appropriately
reflected, despite having an entry in this file).

I'm removing this file because it's obviously pointless to keep around,
and moreover it's misleading.

In theory removing this file might be questionable: the git log reaches
back into CVS and SVN times, which don't have separate committer and
author fields for each comment. The commit messages could be incomplete
and not mention the original author, while the AUTHORS file somehow
could. I doubt this is a real concern, since you can always reconstruct
the original AUTHORS file from git.

Another concern is that this could be interpreted as disrespectful to
the people mentioned in this file; but it isn't meant to be
disrespectful.

Also point out a slight irregularity in the Copyright file.
2013-09-30 00:30:30 +02:00
wm4 df0312b694 Copyright: cleanup entries for removed code 2013-02-03 16:53:49 +01:00
wm4 65fc530f0c Rename to "mpv"
This changes the name of this project to mpv. Most user-visible mentions
of "MPlayer" and "mplayer" are changed to "mpv". The binary name and the
default config file location are changed as well.

The new default config file location is: ~/.mpv/

Remove etc/mplayer.desktop. Apparently this was for the MPlayer GUI,
which has been removed from mplayer2 ages ago.

We don't have a logo, and the MS Windows resource files sort-of require
one, so leave etc/mplayer.ico/.xpm as-is.

Remove the debian and rpm packaging scripts. These contained outdated
dependencies and likely were more harmful than useful. (Patches which
add working and well-tested packaging are welcome.)
2012-10-12 10:14:32 +02:00
Uoti Urpala f9b5f2870c mp3lib: drop internal mp3lib tree
Delete mp3lib which has been the default mp3 decoder until now. In
addition to being an unnecessary embedded library it now fails to
compile correctly with the new gcc-4.6, producing noise.

After the deletion the default decoder priority for mp3 will be first
libmpg123 (a newer version of the code that mp3lib was based on) if
available, then ffmp3float which should be available in all normal
compiles. I think that some tweaking may be required as these decoder
alternatives get wider testing, but any problems should be solvable
and there should be no need for mp3lib.
2011-04-02 07:28:53 +03:00
Uoti Urpala 17528080d6 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+.
2011-03-24 23:40:29 +02:00
Uoti Urpala b27e4ca371 libdvdcss: drop internal libdvdcss tree
The internal libdvdcss version was only compiled if you used internal
libdvdread too; and libdvdread was not included in the sources, so
that'd only happen if you manually added libdvdread in the build
tree. Keeping libdvdcss for that case probably isn't worth it, so
delete it from the tree. The build system part is still there, so an
internal build is possible if you add the directory back.
2011-03-01 22:37:15 +02:00
Uoti Urpala 6122d83981 tremor: drop internal tremor library
Drop internal copy of the tremor library. Note that the internal ogg
demuxer (which is still sometimes useful to work around libavformat
ogg demuxer problems, though it's itself quite buggy) now cannot be
compiled without either external libvorbis or libvorbisidec (tremor).
2011-02-01 21:28:03 +02:00
Uoti Urpala 7cd7416c73 libmpeg2: drop libmpeg2 support
libavcodec mpeg2 decoder has been the default for a while and seems to
work fine.
2011-02-01 20:10:27 +02:00
Uoti Urpala 156ba34ac7 Copyright: delete removed library copies from list 2011-02-01 04:42:37 +02:00
diego 42ed53f221 libfaad2:/ Remove forked internal libfaad2 copy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32741 b3059339-0415-0410-9bf9-f77b7e298cf2

Remove AAC/FAAD2 installation instructions.

There is nothing special about building and installing FAAD2, so there is
no longer a need to keep maintaining instructions for it.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32742 b3059339-0415-0410-9bf9-f77b7e298cf2
2011-01-31 16:00:58 +02:00
diego c8a97067aa libdvdcss: Sync some minor changes from upstream, up to r237
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32349 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:18:07 +02:00
reimar 6c3c1588f5 libgsm: Remove libgsm wrapper
Remove copy of old and ugly libgsm code and wrapper.
Decoding these formats is supported via FFmpeg both natively and
through libgsm.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31657 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31664 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:22 +02:00
reimar 879fff8104 Copyright: clean up libdvdcss entry
We use unmodified r231 of libdvdcss, no point in mentioning older revisions.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31357 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:42 +02:00
diego c8e40a8fba libdvdcss is now synced to a recent upstream Subversion snapshot.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31158 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-11 11:13:07 +00:00
diego 12f67b8372 Remove internal liba52 copy.
Nowadays FFmpeg is faster than liba52 and external liba52 is well supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-09 14:45:29 +00:00
diego 12abc254d5 stream/rtp.h appears not to originate from dvbstream.
In any case it is completely trivial and non-copyrightable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30465 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 21:38:05 +00:00
diego b1037d87ee Clarify which version of the GPL applies to MPlayer.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30201 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-04 13:01:44 +00:00
diego fa60631a76 Update entry for libdvdread; add entry for libdvdnav.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28926 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 23:19:16 +00:00
diego ab1163d8c5 cosmetics: Add newlines for better readability, rename Homepage entry to URL.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28925 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 23:15:26 +00:00
diego e633583d8c libmpdemux/nuppelvideo.h was removed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28922 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-09 20:56:19 +00:00
diego bbcccf2d19 Update internal libmpeg2 copy to version 0.5.1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27604 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-13 17:31:45 +00:00
rathann 97e5f304ce Rename internal libdvdread fork from dvdread to libdvdread
to avoid clashing with external libdvdread.
(Sync with libdvdread r1122)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27498 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 12:22:21 +00:00
diego e915d29f0a Sync libdvdcss with upstream version 1.2.10.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27494 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-29 20:22:36 +00:00
diego c2a12149e2 Sync libdvdcss with upstream version r212.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27474 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-21 13:40:16 +00:00
diego 3a7b71bf78 Update homepage and license info for NuppelVideo.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27225 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 15:13:04 +00:00
diego 6be0c38303 Document where the files vidix/dhahelperwin/ntverp.h and
vidix/dhahelperwin/common.ver come from (ReactOS).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27073 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-06-15 15:27:35 +00:00
diego 971b1a83d8 Add section about code from NuppelVideo / RTJPEG.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26794 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-17 14:33:45 +00:00
diego 33fdc5bf12 Add stanza about files taken from the MJPEG Tools suite.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26778 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 18:18:44 +00:00
diego 1aac3c3fde Fix #endif comment, sync with libdvdcss r208.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25645 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-07 22:46:53 +00:00
diego f9455f34d0 Remove internal unrarlib copy, the new unrarexec code is a strict superset.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25468 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 10:10:26 +00:00
diego f1d6831af9 Upstream committed both of my libdvdcss patches.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24556 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-17 13:09:47 +00:00
diego 9c63470472 Sync libdvdread with version 0.9.7.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24085 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-17 07:57:13 +00:00
diego c5531425ea Sync libdvdread with version 0.9.6.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24075 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-16 06:57:43 +00:00
diego 80dee3f8ac Sync libdvdread with version 0.9.5 (functional changes).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24067 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-15 11:47:22 +00:00
diego ffebfb049d libdvdcss patch got committed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23912 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-29 14:01:50 +00:00
diego b000a6a519 ISO8859-1 --> UTF-8
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23754 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-09 19:50:36 +00:00
diego a2171395a4 Remove obsolete TV output tools.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22860 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-31 14:21:06 +00:00
diego 56d17cef02 Remove internal minilzo, external liblzo can be used instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22259 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-18 15:06:54 +00:00
diego b1cddd4716 libmpeg2 updated to 0.4.1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21863 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-10 14:25:02 +00:00
diego 8cf4397274 Rename libdvdread to dvdread. We really only include only the dvdread
subdirectory of libdvdread.  This will also allow getting rid of some
local modifications.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20997 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 00:33:01 +00:00
diego e19c97bfd4 Fix linking on Cygwin and remove nonsense lseek64 --> lseek indirection,
all in one fell swoop.  Patch by yours truly accepted upstream.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20746 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 16:42:39 +00:00