summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-06-13 10:42:32 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:07:42 +0200
commitbe6a58d4558ffbc75fb8e058ed904cede060e11b (patch)
tree63f3953a239ebc161049af643ef941f7027fa729 /libvo
parentcc438838256eb7703ec057fbea05a6c3f713f4a0 (diff)
downloadmpv-be6a58d4558ffbc75fb8e058ed904cede060e11b.tar.bz2
mpv-be6a58d4558ffbc75fb8e058ed904cede060e11b.tar.xz
vo_gl, csputils: dual-license under LGPL v2.1
Dual-license gl_common and vo_gl under the LGPL v2.1 or later as an alternative to the GPL license. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31375 b3059339-0415-0410-9bf9-f77b7e298cf2 Allow LGPL for csputils as well, they were previously part of gl_common and are still an important part of it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31376 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/csputils.c5
-rw-r--r--libvo/csputils.h5
-rw-r--r--libvo/gl_common.c5
-rw-r--r--libvo/gl_common.h5
-rw-r--r--libvo/vo_gl.c5
5 files changed, 25 insertions, 0 deletions
diff --git a/libvo/csputils.c b/libvo/csputils.c
index 57362f6725..2978279398 100644
--- a/libvo/csputils.c
+++ b/libvo/csputils.c
@@ -18,6 +18,11 @@
* You should have received a copy of the GNU General Public License along
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * You can alternatively redistribute this file 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.
*/
#include <stdint.h>
diff --git a/libvo/csputils.h b/libvo/csputils.h
index 54c6926b96..acc8f59459 100644
--- a/libvo/csputils.h
+++ b/libvo/csputils.h
@@ -14,6 +14,11 @@
* You should have received a copy of the GNU General Public License along
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * You can alternatively redistribute this file 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.
*/
#ifndef MPLAYER_CSPUTILS_H
diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index aa7beb7cf3..c28632e0c0 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -20,6 +20,11 @@
* You should have received a copy of the GNU General Public License along
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * You can alternatively redistribute this file 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.
*/
/**
diff --git a/libvo/gl_common.h b/libvo/gl_common.h
index 65741c899b..53b2ed41d4 100644
--- a/libvo/gl_common.h
+++ b/libvo/gl_common.h
@@ -14,6 +14,11 @@
* You should have received a copy of the GNU General Public License along
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * You can alternatively redistribute this file 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.
*/
#ifndef MPLAYER_GL_COMMON_H
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 6712ebfca8..ef82316259 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -14,6 +14,11 @@
* You should have received a copy of the GNU General Public License along
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * You can alternatively redistribute this file 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.
*/
#include <stdio.h>