summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-17 17:08:51 +0200
committerwm4 <wm4@nowhere>2017-06-17 17:08:51 +0200
commit9c0239ca63fe377f8f9c46aec83bf2c709cee707 (patch)
tree9f4a6bfc563bc68019a85cf64cf006e9648e24e6
parent0086897b725dfacedbafeec8be086f5bf453288e (diff)
downloadmpv-9c0239ca63fe377f8f9c46aec83bf2c709cee707.tar.bz2
mpv-9c0239ca63fe377f8f9c46aec83bf2c709cee707.tar.xz
aspect: change license to LGPL
Quite chaotic history, which code being moved, refactored, duplicated, unified a bunch of times. But I think everything is covered by LGPL agreements. In one case, cehoyos (who didn't agree) applied a patch by someone who agreed, but didn't change anything (except weirdly adding German translations). In another case, cehoyos moved code covered by LGPL agreements (without changing it), which was later used for some other code. We consider both cases not relevant for copyright. win_state.c/.h is similar, but pending for reply by the author of 2ab259e68 (I guess).
-rw-r--r--Copyright2
-rw-r--r--video/out/aspect.c14
-rw-r--r--video/out/aspect.h14
3 files changed, 15 insertions, 15 deletions
diff --git a/Copyright b/Copyright
index 99a5f2a1cd..11a3a664cd 100644
--- a/Copyright
+++ b/Copyright
@@ -310,7 +310,7 @@ x video/img_format.* hard
x video/img_fourcc.h hard
video/mp_image.* almost LGPL
video/mp_image_pool.* LGPL
-x video/out/aspect.* hard
+ video/out/aspect.* LGPL
video/out/bitmap_packer.* LGPL
video/out/cocoa* unknown
video/out/d3d_shader_420p.h LGPL
diff --git a/video/out/aspect.c b/video/out/aspect.c
index 4515b2a5ca..0d37501d11 100644
--- a/video/out/aspect.c
+++ b/video/out/aspect.c
@@ -1,18 +1,18 @@
/*
* This file is part of mpv.
*
- * mpv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with mpv. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
/* Stuff for correct aspect scaling. */
diff --git a/video/out/aspect.h b/video/out/aspect.h
index 614b5378e3..4123311564 100644
--- a/video/out/aspect.h
+++ b/video/out/aspect.h
@@ -1,18 +1,18 @@
/*
* This file is part of mpv.
*
- * mpv is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * mpv is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with mpv. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MPLAYER_ASPECT_H