summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-12-11 18:09:44 +0100
committerwm4 <wm4@nowhere>2016-12-11 18:09:44 +0100
commitc21c68edd48ab45af1dd33c09ec809d1ee100ce1 (patch)
treee9c1793ad2e8e3d201489b819861281d04881e38 /misc
parent2d9b6ff7cd51c352533e13bb24624c387415dbfb (diff)
downloadmpv-c21c68edd48ab45af1dd33c09ec809d1ee100ce1.tar.bz2
mpv-c21c68edd48ab45af1dd33c09ec809d1ee100ce1.tar.xz
bstr: change to LGPL
Was started by Uoti Urpala in commit 5f631d1c. Although it was made part of demux_mkv.c, it's quite obvious that it's not based on any pre-existing demux_mkv.c code (or ebml.c/.h for that matter). Anyone else who has touched this code every since has already agreed to LGPL relicensing.
Diffstat (limited to 'misc')
-rw-r--r--misc/bstr.c14
-rw-r--r--misc/bstr.h14
2 files changed, 14 insertions, 14 deletions
diff --git a/misc/bstr.c b/misc/bstr.c
index 0ef0c357e8..8c47b447d4 100644
--- a/misc/bstr.c
+++ b/misc/bstr.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 <string.h>
diff --git a/misc/bstr.h b/misc/bstr.h
index 4aba35e965..69dbce20eb 100644
--- a/misc/bstr.h
+++ b/misc/bstr.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_BSTR_H