summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-05 15:54:10 +0200
committerwm4 <wm4@nowhere>2017-10-05 15:57:30 +0200
commit158b69f04cac6685eadd1a96c36f5d1f644c5b0b (patch)
tree9b80b39cc79aff33f51a018d869ca2862a027dd6 /demux
parent4eb8623945909e712eea7002b26773b4b8ab9e87 (diff)
downloadmpv-158b69f04cac6685eadd1a96c36f5d1f644c5b0b.tar.bz2
mpv-158b69f04cac6685eadd1a96c36f5d1f644c5b0b.tar.xz
build: switch preliminary LGPL mode from v3 to v2.1
iive agreed to relicense things that are still in mpv to LGPLv2.1. So change the licenses of the affected files, and rename the configure switch for LGPL mode to --enable-preliminary-lgpl2. (The "preliminary" part will probably be removed from the configure switch soon as well.) Also player/main.c hasn't had GPL parts since a few commits ago.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_mf.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 04d37f4aef..c4995a66c5 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -4,7 +4,7 @@
* 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 3 of the License, or (at your option) any later version.
+ * 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
@@ -13,12 +13,6 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
- *
- * The parts making this file LGPL v3 (instead of v2.1 or later) are:
- * 0aa37a0db23c allow autodetection of pictures type when using mf://@fil...
- * (iive agreed to LGPL v3+ only.)
- * Once these changes are not relevant to for copyright anymore (e.g. because
- * they have been removed), this file will change to LGPLv2.1+.
*/
#include <stdio.h>