[SCM] libav/experimental: Relicense test/example files as LGPL with Michael's permission.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:18:41 UTC 2013


The following commit has been merged in the experimental branch:
commit 54e3ae2ea6ab0887548f33ebfb6d9cf8219030c5
Author: Diego Biurrun <diego at biurrun.de>
Date:   Sun Apr 13 01:29:24 2008 +0000

    Relicense test/example files as LGPL with Michael's permission.
    
    Originally committed as revision 26429 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/cs_test.c b/libswscale/cs_test.c
index 2bb7486..d49a605 100644
--- a/libswscale/cs_test.c
+++ b/libswscale/cs_test.c
@@ -3,18 +3,18 @@
  *
  * This file is part of FFmpeg.
  *
- * FFmpeg 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.
+ * FFmpeg 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.
  *
  * FFmpeg 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with FFmpeg; if not, write to the Free Software
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c
index e53c0b3..0b6eff1 100644
--- a/libswscale/swscale-example.c
+++ b/libswscale/swscale-example.c
@@ -3,18 +3,18 @@
  *
  * This file is part of FFmpeg.
  *
- * FFmpeg 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.
+ * FFmpeg 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.
  *
  * FFmpeg 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with FFmpeg; if not, write to the Free Software
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list