r12212 - trunk/libavcodec/faandct.c
Author: michael Date: Mon Feb 25 15:42:12 2008 New Revision: 12212 Log: Allow use of my AAN DCT under BSD, AMD has agreed to write and contribute SSE(float) AAN DCT and IDCT to ffmpeg (no C++, no crap). Modified: trunk/libavcodec/faandct.c Modified: trunk/libavcodec/faandct.c ============================================================================== --- trunk/libavcodec/faandct.c (original) +++ trunk/libavcodec/faandct.c Mon Feb 25 15:42:12 2008 @@ -19,6 +19,9 @@ * 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 + * + * The AAN DCT in this file except ff_faandct248() can also be used under the + * BSD license. */ /**
michael wrote:
Author: michael Date: Mon Feb 25 15:42:12 2008 New Revision: 12212
Log: Allow use of my AAN DCT under BSD, AMD has agreed to write and contribute SSE(float) AAN DCT and IDCT to ffmpeg (no C++, no crap).
Modified: trunk/libavcodec/faandct.c
Modified: trunk/libavcodec/faandct.c ============================================================================== --- trunk/libavcodec/faandct.c (original) +++ trunk/libavcodec/faandct.c Mon Feb 25 15:42:12 2008 @@ -19,6 +19,9 @@ * 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 + * + * The AAN DCT in this file except ff_faandct248() can also be used under the + * BSD license. */
Please state if it is the 3 or 4 clause BSD license. MvH Benjamin Larsson
On Mon, Feb 25, 2008 at 03:45:38PM +0100, Benjamin Larsson wrote:
michael wrote:
Log: Allow use of my AAN DCT under BSD, AMD has agreed to write and contribute SSE(float) AAN DCT and IDCT to ffmpeg (no C++, no crap).
--- trunk/libavcodec/faandct.c (original) +++ trunk/libavcodec/faandct.c Mon Feb 25 15:42:12 2008 @@ -19,6 +19,9 @@ * 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 + * + * The AAN DCT in this file except ff_faandct248() can also be used under the + * BSD license. */
Please state if it is the 3 or 4 clause BSD license.
I was just going to say this. But I don't really think this is enough. The licensing terms should simply be pasted into the license header directly. Michael, dual-licensing like this is IMO not a good idea. Two out of three functions in this file are covered by LGPL 2.1+ and BSDsomething, the third function is not. The third function is very similar to the other two and it is small. I suggest relicensing the whole file and be done with it. Mixing licenses in a single file is IMO asking for trouble in the long run. Diego
On Mon, Feb 25, 2008 at 04:06:37PM +0100, Diego Biurrun wrote: [...]
Michael, dual-licensing like this is IMO not a good idea. Two out of three functions in this file are covered by LGPL 2.1+ and BSDsomething, the third function is not. The third function is very similar to the other two and it is small. I suggest relicensing the whole file and be done with it. Mixing licenses in a single file is IMO asking for trouble in the long run.
The 3rd function was written by roman not me. Thus i cannot relicense it. [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB No human being will ever know the Truth, for even if they happen to say it by chance, they would not even known they had done so. -- Xenophanes
On Mon, Feb 25, 2008 at 06:18:57PM +0100, Michael Niedermayer wrote:
On Mon, Feb 25, 2008 at 04:06:37PM +0100, Diego Biurrun wrote: [...]
Michael, dual-licensing like this is IMO not a good idea. Two out of three functions in this file are covered by LGPL 2.1+ and BSDsomething, the third function is not. The third function is very similar to the other two and it is small. I suggest relicensing the whole file and be done with it. Mixing licenses in a single file is IMO asking for trouble in the long run.
The 3rd function was written by roman not me. Thus i cannot relicense it.
Roman, what do you say? Diego
On Mon, Feb 25, 2008 at 10:32:24PM +0100, Diego Biurrun wrote:
On Mon, Feb 25, 2008 at 06:18:57PM +0100, Michael Niedermayer wrote:
On Mon, Feb 25, 2008 at 04:06:37PM +0100, Diego Biurrun wrote: [...]
Michael, dual-licensing like this is IMO not a good idea. Two out of three functions in this file are covered by LGPL 2.1+ and BSDsomething, the third function is not. The third function is very similar to the other two and it is small. I suggest relicensing the whole file and be done with it. Mixing licenses in a single file is IMO asking for trouble in the long run.
The 3rd function was written by roman not me. Thus i cannot relicense it.
Roman, what do you say?
Roman agreed to relicense this to some sort of BSD/MIT/X11/ISC license in a private mail. We might as well pick some sort of standard while we're at it. I suggest using ISC, which is the simplest. Diego
On Mon, Aug 18, 2008 at 08:21:48PM +0200, Diego Biurrun wrote:
On Mon, Feb 25, 2008 at 10:32:24PM +0100, Diego Biurrun wrote:
On Mon, Feb 25, 2008 at 06:18:57PM +0100, Michael Niedermayer wrote:
On Mon, Feb 25, 2008 at 04:06:37PM +0100, Diego Biurrun wrote: [...]
Michael, dual-licensing like this is IMO not a good idea. Two out of three functions in this file are covered by LGPL 2.1+ and BSDsomething, the third function is not. The third function is very similar to the other two and it is small. I suggest relicensing the whole file and be done with it. Mixing licenses in a single file is IMO asking for trouble in the long run.
The 3rd function was written by roman not me. Thus i cannot relicense it.
Roman, what do you say?
Roman agreed to relicense this to some sort of BSD/MIT/X11/ISC license in a private mail. We might as well pick some sort of standard while we're at it. I suggest using ISC, which is the simplest.
I will replace the license statement in the file with the following on Monday then: * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Diego
On Mon, Feb 25, 2008 at 04:06:37PM +0100, Diego Biurrun wrote:
On Mon, Feb 25, 2008 at 03:45:38PM +0100, Benjamin Larsson wrote:
michael wrote:
Log: Allow use of my AAN DCT under BSD, AMD has agreed to write and contribute SSE(float) AAN DCT and IDCT to ffmpeg (no C++, no crap).
--- trunk/libavcodec/faandct.c (original) +++ trunk/libavcodec/faandct.c Mon Feb 25 15:42:12 2008 @@ -19,6 +19,9 @@ * 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 + * + * The AAN DCT in this file except ff_faandct248() can also be used under the + * BSD license. */
Please state if it is the 3 or 4 clause BSD license.
I was just going to say this. But I don't really think this is enough. The licensing terms should simply be pasted into the license header directly.
patch welcome [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB I am the wisest man alive, for I know one thing, and that is that I know nothing. -- Socrates
Benjamin Larsson wrote:
michael wrote:
Author: michael Date: Mon Feb 25 15:42:12 2008 New Revision: 12212
Log: Allow use of my AAN DCT under BSD, AMD has agreed to write and contribute SSE(float) AAN DCT and IDCT to ffmpeg (no C++, no crap).
Modified: trunk/libavcodec/faandct.c
Modified: trunk/libavcodec/faandct.c ============================================================================== --- trunk/libavcodec/faandct.c (original) +++ trunk/libavcodec/faandct.c Mon Feb 25 15:42:12 2008 @@ -19,6 +19,9 @@ * 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 + * + * The AAN DCT in this file except ff_faandct248() can also be used under the + * BSD license. */
Please state if it is the 3 or 4 clause BSD license.
Or 2-clause. -- M?ns Rullg?rd mans at mansr.com
participants (5)
-
banan＠ludd.ltu.se -
diego＠biurrun.de -
mans＠mansr.com -
michaelni＠gmx.at -
subversion＠mplayerhq.hu