[Ffmpeg-cvslog] r6577 - in trunk: [lots of files]

[Diego Biurrun]

On Mon, Oct 09, 2006 at 01:25:32AM +0200, Michael Niedermayer wrote:
> 
> On Mon, Oct 09, 2006 at 12:04:41AM +0300, Uoti Urpala wrote:
> > On Sun, 2006-10-08 at 22:50 +0200, Michael Niedermayer wrote:
> > > what is the difference between GPL v2 and v2.1? is it that 2.1 doesnt exist?
> > > i cant find it on fsf.org ...
> > 
> > Did some part of the commit talk about GPL v2.1? LGPL v2.1 certainly
> > does exist, it's where the name changed from "Library" in 2 to "Lesser"
> > in 2.1 among other things.
> 
> see below of one case i found
> 
> --- trunk/libavcodec/dtsdec.c	(original)
> +++ trunk/libavcodec/dtsdec.c	Sat Oct  7 17:30:46 2006
> @@ -2,20 +2,20 @@
>   *
> - * This library is free software; you can redistribute it and/or modify
> + * 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
> + * the Free Software Foundation; either version 2.1 of the License, or
>   * (at your option) any later version.

Good catch.  I looked over the diff twice, but it was so huge...  I was
also unaware that our libdts glue code was GPL and not LGPL, it's not
explicitly marked as such in the Makefile (well, of course configure
requires --enable-gpl to enable libdts support..).

I have doublechecked again and noticed that libavcodec/sparc/vis.h is
marked as GPL although the initial commit log message says it can be
used as LGPL with permission from the author..

Diego