summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-30 10:50:20 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-30 10:50:20 +0000
commitd0d900423c6eb3e297f510e08205b7f59598e376 (patch)
tree70bd0879615bd8a39bf83da0a650faa7929ea3bd
parent6b35c085e4335b17ffe33d89a34d5616375d03fd (diff)
downloadmpv-d0d900423c6eb3e297f510e08205b7f59598e376.tar.bz2
mpv-d0d900423c6eb3e297f510e08205b7f59598e376.tar.xz
make the C code of the swscaler which i wrote LGPL
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19600 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libswscale/swscale.c3
-rw-r--r--libswscale/swscale.h3
-rw-r--r--libswscale/swscale_internal.h3
-rw-r--r--libswscale/swscale_template.c3
4 files changed, 12 insertions, 0 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 18ae7ae352..fc5690c738 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -14,6 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ the C code (not assembly, mmx, ...) of the swscaler which has been written
+ by Michael Niedermayer can be used under the LGPL license too
*/
/*
diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index 0b350234ea..2b558a25b7 100644
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -14,6 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ the C code (not assembly, mmx, ...) of the swscaler which has been written
+ by Michael Niedermayer can be used under the LGPL license too
*/
#ifndef SWSCALE_H
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 177074d6a5..fd74ecb052 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -14,6 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ the C code (not assembly, mmx, ...) of the swscaler which has been written
+ by Michael Niedermayer can be used under the LGPL license too
*/
#ifndef SWSCALE_INTERNAL_H
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index b9cfc3c5b1..0d1689cbf2 100644
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -14,6 +14,9 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ the C code (not assembly, mmx, ...) of the swscaler which has been written
+ by Michael Niedermayer can be used under the LGPL license too
*/
#undef REAL_MOVNTQ