[FFmpeg-cvslog] r12212 - trunk/libavcodec/faandct.c

[Diego Biurrun]

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