path: root/Copyright
diff options
authorwm4 <wm4@nowhere>2017-06-20 14:09:46 +0200
committerwm4 <wm4@nowhere>2017-06-20 14:26:50 +0200
commit3fff6bc5f23e59f375de407f8b786ffc40f93b30 (patch)
tree9f165fb991100dc0f472a55c274f78c1a4466838 /Copyright
parent1890529857a3b963df476f53ca41faacab48a6d2 (diff)
demux: change license to LGPL
As usual, the history of these files is a bit murky. It starts with the initial commit. (At which some development had already been done, according to the AUTHORS and ChangeLog files at the time, we should be but covered with relicensing agreements, though.) then it goes on with complete lack of modularization, which was cleaned up later (cd68e161). As usual, we don't consider the copyright of the stuff that has been moved out cleanly. There were also contributions to generic code by people who could not be reached or who did not agree to the relicensing, but this was all removed. The only patches that we could not relicense and which were still in the current code in some form are from Dénes Balatoni: 422b0d2a, 32937181. We could not reach him, so commits f34e1a0d and 18905298 remove his additions. It still leaves the demux_control() declaration itself, but we don't consider it copyrightable. It's basically an idiom that existed in MPlayer before that change, applied to the demuxer struct. (We even went as far as making sure to remove all DEMUXER_CTRLs the original author added.) Commit be54f481 might be a bit of a corner case, but this was rewritten, and we consider the old copyright removed long ago.
Diffstat (limited to 'Copyright')
1 files changed, 1 insertions, 1 deletions
diff --git a/Copyright b/Copyright
index 55765d6916..c71ee4c0ad 100644
--- a/Copyright
+++ b/Copyright
@@ -134,7 +134,7 @@ x audio/format.* hard (murky libaf origins)
common/version.c LGPL
demux/codec_tags.* LGPL
demux/cue.* LGPL
-x demux/demux.* complications (at least Denes' changes)
+ demux/demux.* LGPL
demux/demux_cue.c LGPL
demux/demux_disc.c LGPL
demux/demux_edl.c LGPL