[MPlayer-cvslog] r30182 - in trunk: Makefile configure libvo/matrixview.c libvo/matrixview.h libvo/matrixview_font.h libvo/video_out.c libvo/vo_matrixview.c

[Reimar Döffinger]

On Mon, Jan 04, 2010 at 01:09:11PM +0100, Diego Biurrun wrote:
> On Mon, Jan 04, 2010 at 01:06:19PM +0100, Reimar Döffinger wrote:
> > On Mon, Jan 04, 2010 at 12:56:14PM +0100, Reimar Döffinger wrote:
> > > On Mon, Jan 04, 2010 at 11:28:09AM +0100, Diego Biurrun wrote:
> > > > > --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> > > > > +++ trunk/libvo/matrixview.c	Sun Jan  3 15:54:51 2010	(r30182)
> > > > > @@ -0,0 +1,378 @@
> > > > > + * MatrixView is free software; you can redistribute it and/or modify
> > > > > + * it under the terms of the GNU General Public License version 2 as
> > > > > + * published by the Free Software Foundation.
> > > > 
> > > > Danger Will Robinson!
> > > > 
> > > > This is GPL v2, not GPL v2+ as the rest of MPlayer.  This is not
> > > > acceptable, please ask the patch submitter to relicense.
> > > 
> > > Not particularly realistic, there are already about 4 authors for that
> > > code, and it is copied from code that is GPL v2 only.
> > 
> > (note that I asked them anyway though, but an alternative plan would be
> > good - is wasn't aware that everything is "or later" or I would have
> > waited a bit longer)
> 
> Everything except for libmpdemux/demux_ty_osd.c.  I will try to reach
> that person by phone once more, otherwise I think we should remove that
> code.

Normally I don't like such removals, but given that I haven't been able
to find out what it actually good for, nor found any samples or anything
I'm tempted to be for removal (though it would be better to just disable
it first, maybe someone comes around with samples and we can then still
decide or possibly reimplement).