[MPlayer-cvslog] license wars!

[Diego Biurrun]

On Sun, Dec 30, 2007 at 11:36:53PM +0100, Diego Biurrun wrote:
> On Sat, Dec 22, 2007 at 10:45:02PM +0100, Diego Biurrun wrote:
> > 
> > I'm not aware of any other code being marked as GPL v2 only.  I haven't
> > looked at each file explicitly, but I grepped and looked around
> > extensively.  If I am wrong about this, say so.
> 
> I spoke too soon, there are still a few files left, namely:
> 
> libaf/af_lavcresample.c
> libaf/af_sweep.c
> 
> written by Michael Niedermayer
> 
> libvo/gtf.c
> 
> written by Rudolf Marek
> 
> libvo/vesa_lvo.c
> libvo/vesa_lvo.h
> libvo/vo_vesa.c
> 
> written by Nick Kurshev.
> 
> I've contacted all authors in order to get the files relicensed, Nick
> already agreed.
> 
> I'll now look through all files individually in order to dispel all
> doubts.

I actually did have a look at every single source file and apart from
noticing tons of missing or wrong multiple inclusion guards I found six
more GPL v2 files:

libvo/vosub_vidix.c
libvo/vosub_vidix.h

These are from Nick as well, he agreed to relicense all his stuff.

libmpcodecs/ve_x264.c
libmpdemux/demux_ty_osd.c

I'll send mail to the authors in a moment.

Then there are these two files written by Reimar:

TOOLS/edgedetect.fp
TOOLS/emboss.fp

Reimar, would you relicense them?

So all in all the following 3 files are marked as GPL v2 and part of
MPlayer proper (i.e. not optional stuff in TOOLS or similar):

libmpcodecs/ve_x264.c
libmpdemux/demux_ty_osd.c
libvo/gtf.c

So for now I guess I will have to retract the statement on the homepage,
as long as these files are included, MPlayer is still GPL v2.

Diego