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

[Diego Biurrun]

On Thu, Oct 14, 2010 at 11:49:44AM +0200, Nicolas George wrote:
> Le primidi 21 vendémiaire, an CCXIX, Reimar Döffinger a écrit :
> > Usually you shouldn't expect Diego to comment much on code correctness,
> > you'd have to get someone else to review for that (unfortunately
> > that usually means you'll have to get me to review).
> 
> Ok, that is duly noted.

Good :)

> > Just put it in root for now if you want.
> 
> Ok. That gives the attached patch, after a:
> 
> svn copy libvo/gl_common.c pnm_loader.c

A lot of subtitle-related stuff depends on things from libvo, so
I'm not sure this is worth cluttering the root dir with.

> > My suggestion is to name that dir sub/, because all these are
> > related to subtitles (even though they are about more than subtitles).
> 
> That is still planned.

Bump up the priority :)

> --- 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.

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

> +#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.

Diego