summaryrefslogtreecommitdiffstats
path: root/Copyright
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-18 18:27:48 +0200
committerwm4 <wm4@nowhere>2017-06-18 18:58:36 +0200
commit642e963c86040350ac8f06b9731e6126f4d55316 (patch)
tree6610e7ef708ab3a64d273bbc187c8477260737df /Copyright
parent078b275514d9f1ba89b386c12aa5a02a65633e9e (diff)
downloadmpv-642e963c86040350ac8f06b9731e6126f4d55316.tar.bz2
mpv-642e963c86040350ac8f06b9731e6126f4d55316.tar.xz
dec_video: change license to LGPL (almost)
"Almost" because this might contain copyright by michael, who agreed with LGPL, but only once the core is LGPL. This is preparation for that to happen. Apart from that, the usual remarks apply. In particular, dec_video.c started out quite chaotic with no modularization, but was later basically gutted, and in general rewritten a bunch of times. Not going to give a history lesson. Special attention needs to be given to 3 patches by cehosos, who did not agree to the relicensing: 240b743ebdf: --field-dominance e32cbbf7dc3: reinit VO if aspect ratio changes 306f6243fdf: use container aspect if codec aspect unset (?) The first patch is pretty clearly still in the current code, and needs to be disabled for LGPL. The functionality of the second patch is still active, but implemented completely different, and as part of general frame parameter changes (at the time of the patch, MPlayer already reinitialized the VO on frame size and pixel format changes - all this was merged into a single check for changing image parameters). The third patch makes me a bit more uncomfortable. It appears the code was moved to dec_video.c in de68b8f23c8c, and further changed in 82f0d373, 0a0bb905, and bf13bd0d. You could claim that cehoyos' copyright still sticks. Fortunately, we implement alternative aspect detection, which is simpler and probably preferable, and which arguably contains none of the original code and logic, and thus should be fully safe. While I don't know if cehoyos' copyright actually still applies, I'm more comfortable with making the code GPL-only for now. Also change the default to use the (in future) plain LGPL code, and deprecate the one associated with the GPL code, so we can eventually remove the GPL code. But it's also possible we decide that the copyright doesn't apply, and undo the deprecation and GPL guards. I expect that users won't notice anything. If you ask me, the old aspect method was probably an accidental bug instead of intentional behavior. Although, the new aspect method was broken too, so I had to fix it.
Diffstat (limited to 'Copyright')
-rw-r--r--Copyright2
1 files changed, 1 insertions, 1 deletions
diff --git a/Copyright b/Copyright
index d92f323a82..5dfd6a8a01 100644
--- a/Copyright
+++ b/Copyright
@@ -267,7 +267,7 @@ x stream/stream.h hard
sub/* LGPL
ta/* LGPL (ISC)
video/decode/d3d.* LGPL
-x video/decode/dec_video.* hard
+ video/decode/dec_video.* almost LGPL
video/decode/hw_cuda.c LGPL
video/decode/hw_d3d11va.c LGPL
video/decode/hw_dxva2.c LGPL