summaryrefslogtreecommitdiffstats
path: root/Copyright
Commit message (Collapse)AuthorAgeFilesLines
* demux/stheader: change license to LGPLwm42017-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | All authors of the current code have agreed. For most of its life, MPlayer used Microsoft structs like WAVEFORMATEX to describe media content. It appears these were copied from wine in 61c5a99851e. Copyright is unclear, but mpv completely removed use of these structs anyway. (demux_mkv.c still contains code to read these fields from a byte stream, but the struct is fully gone.) 42f97b2b820: cehoyos (who probably didn't agree with LGPL) applied a patch by someone who agreed. It's unknown whether cehoyos modified the patch (and thus his copyright would apply), but the changed code was removed anyway. (The code was first moved somewhere else, then removed.) efd53eed614: the patch author was not asked. Although the mkv_sh_sub_t struct was later moved to stheader.h, the added field was removed without replacement. f6878753fbd: nick, who could not be reached, added an include guard, but the guard was changed several times later, and it's probably not copyrightable anyway. afb0fd5ea17: the same nick adds a field that was later replaced and finally removed again in 8cd6b20571.
* af_scaletempo: change license to LGPLwm42017-05-091-1/+1
| | | | | | | | | | | | All authors have agreed. The initial commit d33703496c as well as the current code contain this line: * inspired by SoundTouch library by Olli Parviainen We assume this is about the algorithm (not the code), and the author of the original patch actually wrote all code himself.
* af_lavcac3enc: change license to LGPLwm42017-05-091-1/+1
| | | | | | | All authors have agreed. As usual with these things, this probably does not include residues from the libaf framework.
* ao_pulse, ao_rsound: change license to LGPLwm42017-05-081-2/+2
| | | | | | | | All authors have agreed. One exception is 71247a97b35, whose author was not asked, but we deem the change as trivial. (And technically it was replaced when the audio chain dropped non-native endian sample formats.)
* ao_coreaudio: change license to LGPLwm42017-05-081-9/+9
| | | | | | | | | | | | | | | | All authors have agreed to the relicensing. The code was pretty much rewritten by Stefano Pigozzi. Since the rewrite happened incrementally, and seems to include refactored portions of older code, this relicensing was done on the pre-refactor code do. The original commit adding this AO (as ao_macosx.c) credits Timothy J. Wood as original author. He was asked and agreed to LGPL. It's not entirely sure from which project this code came from, but it's probably libao. In that project, Stanley Seibert made some changes to it (who as a major developer of libao was asked just to be sure), and also Ralph Giles and Ben Hines made two small changes. The latter were not asked, but none of their code survived anyway.
* osdep/endian.h: change license to LGPLwm42017-05-081-1/+1
| | | | | | | | | | | | Or maybe it would be better to write "confirm" than "change". The MP_SELECT_LE_BE macro definition has some similarity with some old MPlayer definition, but it's different code with a different idea, so I don't think it's affected by that. The BYTE_ORDER etc. macro definitions are similar to those found in various system headers (this code emulates the ones often found in <sys/types.h>), but I don't think there is a copyright problem either.
* osdep/compiler.h: change license to LGPLwm42017-05-081-1/+1
| | | | | | | | | | | This didn't have a header and this was implied LGPL, but this was not entirely correct. It turns out the printf attribute code was leaked in from talloc, which is "LGPL v3 or later". talloc was added to the mplayer2 code base in 27a30e310e1. This remaining code was an oversight. Since we want to reduce LGPL v3 code, replace this code with the one from ta/ta.h. This code was explicitly written newly to get rid of talloc and its license in 0933f12d28e.
* cache: change license to LGPL v3wm42017-05-081-1/+1
| | | | | | | | | | | | | All authors have agreed to the relicensing. iive has insisted on "LGPL v3 or later", which makes the file LGPL v3. His commits are the following: 84ec57750883 9b0d8c680f63. All other contributions are LGPL v2.1. I hope we can remove these changes completely one day to make this file LGPL v2.1. iive also authored commit 3934b160a829, but this code is completely gone today. (fork() and shared memory use was removed completely in favor of threads.)
* stream_null: change license to LGPLwm42017-05-081-1/+1
|
* osdep/timer*: change license to LGPLwm42017-05-051-3/+3
| | | | | | | | | | | | | | All authors have agreed, with the following exceptions: e68d7f6858: wight wasn't asked (I think...), but even if he modified the patch he applied, all code added by it was removed again later. cb7768f9bb: nick could not be reached, but the declarations he added as well as the full timer.c file were deleted again in cff81fe498 and f800a42e45 (did it really take 6 years to remove unused declarations?). ffaf4af230: it looks like this person wasn't contacted, but the code added was removed again in f544bcf105.
* Copyright: add list of files that have to be relicensedwm42017-05-051-0/+287
| | | | | | | This comes with estimated level of difficulty. Files which were already LGPL are listed too, to avoid potential confusion. Some entries use shell wildcards.
* msg.c/h: partially change license to LGPLwm42017-05-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 48bd03dd91232. 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 fc4d6e617d8d removed these specific additions a long time ago).
* Copyright: change osd font license to LGPLwm42017-04-211-1/+1
| | | | | | | 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 1e4d3a2440e94 to avoid any potential problems (although that change was probably not copyrightable anyway).
* Copyright: version.sh is GPLwm42017-03-131-0/+1
|
* Copyright: list specific exceptions to stated ruleswm42017-02-161-1/+9
| | | | | | | | | | 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.
* vo_opengl: remove nnedi3 prescalerBin Jin2016-06-181-3/+0
|
* vo_opengl: require --enable-gpl3 for nnediwm42015-12-031-0/+3
| | | | | | | | | 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.
* Copyright: mention that more liberal licenses are ok toowm42015-07-261-1/+1
| | | | In fact, some source files do this.
* Require contributions in LGPLv2.1+wm42015-07-241-2/+10
| | | | | | | | | | | 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.
* Copyright, LICENSE: switch to GPL version 2 or laterwm42013-10-131-32/+14
| | | | | | | | | | | | | | | 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.
* Remove completely outdated AUTHORS filewm42013-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* Copyright: cleanup entries for removed codewm42013-02-031-63/+3
|
* Rename to "mpv"wm42012-10-121-0/+3
| | | | | | | | | | | | | | | | | | 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.)
* mp3lib: drop internal mp3lib treeUoti Urpala2011-04-021-10/+0
| | | | | | | | | | | | | 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.
* Copyright, LICENSE: change binary license to GPL 3Uoti Urpala2011-03-241-4/+5
| | | | | | | 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+.
* libdvdcss: drop internal libdvdcss treeUoti Urpala2011-03-011-8/+0
| | | | | | | | | 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.
* tremor: drop internal tremor libraryUoti Urpala2011-02-011-8/+0
| | | | | | | 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).
* libmpeg2: drop libmpeg2 supportUoti Urpala2011-02-011-13/+0
| | | | | libavcodec mpeg2 decoder has been the default for a while and seems to work fine.
* Copyright: delete removed library copies from listUoti Urpala2011-02-011-46/+4
|
* libfaad2:/ Remove forked internal libfaad2 copydiego2011-01-311-8/+0
| | | | | | | | | | | 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
* libdvdcss: Sync some minor changes from upstream, up to r237diego2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32349 b3059339-0415-0410-9bf9-f77b7e298cf2
* libgsm: Remove libgsm wrapperreimar2010-11-021-8/+0
| | | | | | | | | | 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
* Copyright: clean up libdvdcss entryreimar2010-11-021-1/+1
| | | | | | 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
* libdvdcss is now synced to a recent upstream Subversion snapshot.diego2010-05-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31158 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove internal liba52 copy.diego2010-05-091-12/+0
| | | | | | | 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
* stream/rtp.h appears not to originate from dvbstream.diego2010-01-301-1/+1
| | | | | | | 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
* Clarify which version of the GPL applies to MPlayer.diego2010-01-041-5/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30201 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update entry for libdvdread; add entry for libdvdnav.diego2009-03-091-6/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28926 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: Add newlines for better readability, rename Homepage entry to URL.diego2009-03-091-18/+35
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28925 b3059339-0415-0410-9bf9-f77b7e298cf2
* libmpdemux/nuppelvideo.h was removed.diego2009-03-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28922 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update internal libmpeg2 copy to version 0.5.1.diego2008-09-131-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27604 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename internal libdvdread fork from dvdread to libdvdreadrathann2008-08-301-1/+1
| | | | | | | | 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
* Sync libdvdcss with upstream version 1.2.10.diego2008-08-291-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27494 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync libdvdcss with upstream version r212.diego2008-08-211-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27474 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update homepage and license info for NuppelVideo.diego2008-07-061-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27225 b3059339-0415-0410-9bf9-f77b7e298cf2
* Document where the files vidix/dhahelperwin/ntverp.h anddiego2008-06-151-0/+7
| | | | | | | vidix/dhahelperwin/common.ver come from (ReactOS). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27073 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add section about code from NuppelVideo / RTJPEG.diego2008-05-171-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26794 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add stanza about files taken from the MJPEG Tools suite.diego2008-05-141-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26778 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix #endif comment, sync with libdvdcss r208.diego2008-01-071-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25645 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove internal unrarlib copy, the new unrarexec code is a strict superset.diego2007-12-201-8/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25468 b3059339-0415-0410-9bf9-f77b7e298cf2
* Upstream committed both of my libdvdcss patches.diego2007-09-171-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24556 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync libdvdread with version 0.9.7.diego2007-08-171-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24085 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync libdvdread with version 0.9.6.diego2007-08-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24075 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync libdvdread with version 0.9.5 (functional changes).diego2007-08-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24067 b3059339-0415-0410-9bf9-f77b7e298cf2
* libdvdcss patch got committed.diego2007-07-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23912 b3059339-0415-0410-9bf9-f77b7e298cf2
* ISO8859-1 --> UTF-8diego2007-07-091-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23754 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove obsolete TV output tools.diego2007-03-311-7/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22860 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove internal minilzo, external liblzo can be used instead.diego2007-02-181-7/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22259 b3059339-0415-0410-9bf9-f77b7e298cf2
* libmpeg2 updated to 0.4.1diego2007-01-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21863 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename libdvdread to dvdread. We really only include only the dvdreaddiego2006-11-181-1/+1
| | | | | | | | 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
* Fix linking on Cygwin and remove nonsense lseek64 --> lseek indirection,diego2006-11-071-1/+1
| | | | | | | 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
* libmpdvdkit2 --> libdvdread, it just contains libdvdread now.diego2006-11-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20631 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move libdvdcss into its own subdirectory.diego2006-11-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20629 b3059339-0415-0410-9bf9-f77b7e298cf2
* libdvdcss r202, my patch was committed upstream.diego2006-11-011-1/+1