aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoren Merritt <lorenm@u.washington.edu>2011-07-03 22:47:10 +0000
committerDiego Biurrun <diego@biurrun.de>2011-07-07 16:51:47 +0200
commit2f0a10174efd47f210e4863cb66da54cfb5a898e (patch)
tree6de97272433db9d65080436ff2c3fb32301b97a9
parentd32b2d4de164d6e2bd4b441c5f2aa0e442fef1f6 (diff)
downloadffmpeg-2f0a10174efd47f210e4863cb66da54cfb5a898e.tar.gz
vf_gradfun: relicense x86 asm to LGPL
Actually I gave permission for LGPL long ago, but the original import failed to update the license header. (cherry picked from commit 082768f0b189b1706fdcd15b42dcca5fd0822315)
-rw-r--r--libavfilter/x86/gradfun.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/libavfilter/x86/gradfun.c b/libavfilter/x86/gradfun.c
index c9ade8294a..ff3b19d38d 100644
--- a/libavfilter/x86/gradfun.c
+++ b/libavfilter/x86/gradfun.c
@@ -1,19 +1,21 @@
/*
+ * Copyright (C) 2009 Loren Merritt <lorenm@u.washignton.edu>
+ *
* This file is part of Libav.
*
- * Libav 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.
+ * Libav 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.
*
* Libav 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 Libav; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/cpu.h"