summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Copyright10
-rw-r--r--options/path.c23
-rw-r--r--options/path.h14
3 files changed, 21 insertions, 26 deletions
diff --git a/Copyright b/Copyright
index 283ea1106a..6df443c2a9 100644
--- a/Copyright
+++ b/Copyright
@@ -162,7 +162,7 @@ LGPL relicensing status:
options/options.* very hard (lots of options and history)
options/parse_commandline.* easy
options/parse_configfile.* easy
- options/path.* medium
+ options/path.* LGPL
osdep/android/* LGPL (BSD)
osdep/ar/* LGPL (BSD)
osdep/atomic.h LGPL
@@ -184,10 +184,10 @@ LGPL relicensing status:
osdep/main-fn-win.c LGPL
osdep/mpv.exe.manifest easy
osdep/mpv.rc easy
- osdep/path.h unknown
- osdep/path-macosx.m unknown
- osdep/path-unix.c unknown
- osdep/path-win.c unknown
+ osdep/path.h LGPL
+ osdep/path-macosx.m LGPL
+ osdep/path-unix.c LGPL
+ osdep/path-win.c LGPL
osdep/semaphore.h LGPL
osdep/semaphore_osx.c LGPL
osdep/strnlen.h LGPL
diff --git a/options/path.c b/options/path.c
index 7353d6fffd..a2b9f28527 100644
--- a/options/path.c
+++ b/options/path.c
@@ -1,25 +1,20 @@
/*
- * Get path to config dir/file.
- *
- * Return Values:
- * Returns the pointer to the ALLOCATED buffer containing the
- * zero terminated path string. This buffer has to be FREED
- * by the caller.
- *
* 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.
+ * Get path to config dir/file.
+ *
+ * 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 <assert.h>
diff --git a/options/path.h b/options/path.h
index 203651a931..0d488fcb89 100644
--- a/options/path.h
+++ b/options/path.h
@@ -3,18 +3,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_PATH_H