summaryrefslogtreecommitdiffstats
path: root/Copyright
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-11-06 20:53:27 +0100
committerwm4 <wm4@nowhere>2017-11-06 20:53:27 +0100
commita2a623ebb9309d05113bd400449b618aa21f783f (patch)
treeb92f74d74e816bd7588f60dad984e3829f6a6c47 /Copyright
parent921073bf8645ed9e74e8e2463d2a6f6ab9c7bfe6 (diff)
downloadmpv-a2a623ebb9309d05113bd400449b618aa21f783f.tar.bz2
mpv-a2a623ebb9309d05113bd400449b618aa21f783f.tar.xz
player: change license of some code surrounding --frames to LGPL
The original author of the patch has agreed now.
Diffstat (limited to 'Copyright')
-rw-r--r--Copyright3
1 files changed, 0 insertions, 3 deletions
diff --git a/Copyright b/Copyright
index 71b10cf4c7..63470c717c 100644
--- a/Copyright
+++ b/Copyright
@@ -43,7 +43,6 @@ them quite central:
- many builtin video filters (use libavfilter instead)
- automatic rotation and stereoscopic video handling
- Linux TV input
-- the --frames option
- the add/cycle and sub-add/audio-add/sub-remove/audio-remove commands
- video format conversion (if not supported by the VO)
- minor features: jack, DVD, CDDA, SMB, CACA, legacy direct3d VO
@@ -111,10 +110,8 @@ The following files are still GPL only (--enable-lgpl disables them):
The following files contain some optional GPL code (--enable-lgpl disables it):
input/cmd_list.c potentially some commands
- options/options.c --frames option
options/parse_commandline.c dvd:// expansion
player/audio.c libaf glue code
- player/loadfile.c --frames option (minor but probably fatal)
player/osd.c OSD level 3
player/command.c add/cycle command, possibly sub-add command