summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-20 13:09:28 +0200
committerwm4 <wm4@nowhere>2017-06-20 14:22:10 +0200
commit5bfbe6dfde01704979dd086d5184ea2e697cb510 (patch)
treec39dca23522027ca4f4aa9263a3440f68c5188d6
parentbc108bece210b90c472c28ce38ff6b541f999381 (diff)
downloadmpv-5bfbe6dfde01704979dd086d5184ea2e697cb510.tar.bz2
mpv-5bfbe6dfde01704979dd086d5184ea2e697cb510.tar.xz
external_files: change license to LGPL
While we could easily ifdef-out this file for a LGPL core, it's still annoying, and also the only GPL file remaining in player/ that is not based on mplayer.c. This file originates from subreader.c. It's not clear whether the original author of it gave us permission to relicense to LGPL (he probably did, but without further clarification it's sort of ambiguous), but the subtitle file search code was written by other authors anyway (see 7eef93819f9d). One contribution (574eb892ea) is a bit of a corner case, as test_ext_list() now does a bstrcasecmp(). But I don't think the copyright remains here. (I asked the author anyway, just in case. But I didn't wait for the answer.) In some other cases, contributors who could not be reached added some subtitle extensions. I don't think those are copyrightable on their own, but I dropped them anyway just to be sure.
-rw-r--r--Copyright2
-rw-r--r--player/external_files.c20
-rw-r--r--player/external_files.h14
3 files changed, 18 insertions, 18 deletions
diff --git a/Copyright b/Copyright
index 9fbb964171..55765d6916 100644
--- a/Copyright
+++ b/Copyright
@@ -223,7 +223,7 @@ x player/command.c extremely hard (also some GPL-only things)
x player/command.h hard
x player/configfiles.c unknown
x player/core.h extremely hard
-x player/external_files.* hard (murky subreader.c origins)
+ player/external_files.* LGPL
player/lavfi.* LGPL
x player/loadfile.c extremely hard
player/lua/*.* LGPL
diff --git a/player/external_files.c b/player/external_files.c
index 131e526f10..68d0915c6c 100644
--- a/player/external_files.c
+++ b/player/external_files.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/>.
*/
#include <dirent.h>
@@ -32,9 +32,9 @@
#include "options/path.h"
#include "external_files.h"
-static const char *const sub_exts[] = {"utf", "utf8", "utf-8", "idx", "sub", "srt",
- "smi", "rt", "ssa", "aqt", "jss",
- "js", "ass", "mks", "vtt", "sup", "scc",
+static const char *const sub_exts[] = {"utf", "utf8", "utf-8", "idx", "sub",
+ "srt", "rt", "ssa", "ass", "mks", "vtt",
+ "sup", "scc",
NULL};
static const char *const audio_exts[] = {"mp3", "aac", "mka", "dts", "flac",
diff --git a/player/external_files.h b/player/external_files.h
index 223bf06e86..7d7d751332 100644
--- a/player/external_files.h
+++ b/player/external_files.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_FIND_SUBFILES_H