[MPlayer-cvslog] r32478 - in trunk: DOCS/tech/slave.txt command.c input/input.c input/input.h

[Reimar Döffinger]

On Fri, Oct 15, 2010 at 07:51:45PM +0200, Diego Biurrun wrote:
> > --- pnm_loader.h	(revision 0)
> > +++ pnm_loader.h	(revision 0)
> > @@ -0,0 +1,35 @@
> > +/*
> > + * MPlayer 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
> > + * (at your option) any later version.
> > + *
> > + * MPlayer is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + * GNU General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License along
> > + * with MPlayer; if not, write to the Free Software Foundation, Inc.,
> > + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> > + *
> > + * You can alternatively redistribute this file and/or
> > + * modify it under the terms of the GNU Lesser General Public
> > + * License as published by the Free Software Foundation; either
> > + * version 2.1 of the License, or (at your option) any later version.
> > + */
> 
> You misunderstood how the LPGL works: You can always upgrade from LGPL
> to GPL (any version).  So this is completely pointless, just LGPL would
> achieve the same thing.

This is just kept from gl_common. And the reasoning is still the same:
Changing the first part just to say LGPL would make it claim that
MPlayer is LGPL.

> IMO just keep it as GPL as all the other files.  This header is trivial
> anyway.

Header and C file having different licenses is a bit silly, and I'd _slightly_
prefer it to stay available under LGPL, though it does not matter much.

> > +#ifndef MPLAYER_PNM_LOADER_H
> > +#define MPLAYER_PNM_LOADER_H
> > +
> > +#include <stdlib.h>
> > +#include <stdint.h>
> > +
> > +uint8_t *read_pnm(FILE *f, int *width, int *height,
> > +                  int *bytes_per_pixel, int *maxval);
> 
> I think FILE is in stdio.h, not stdlib.h.

Correct.