[FFmpeg-cvslog] r12379 - trunk/README

[Michel Bardiaux]

diego wrote:
> Author: diego
> Date: Sat Mar  8 20:24:06 2008
> New Revision: 12379
> 
> Log:
> Mention that libavdevice/x11grab.c is GPLed.
> 
> 
> Modified:
>    trunk/README
> 
> Modified: trunk/README
> ==============================================================================
> --- trunk/README	(original)
> +++ trunk/README	Sat Mar  8 20:24:06 2008
> @@ -20,6 +20,9 @@ FFmpeg README
>  * The file libavcodec/i386/idct_mmx.c is distributed under the GNU General
>    Public License. It is strictly an optimization and its use is optional.

Mm, I see that x11grab.c asserts
"* FFmpeg 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."

Isn't that a bit misleading?


>  
> +* The file libavdevice/x11grab.c is distributed under the GNU General
> +  Public License. X11 grabbing is optional.
> +
>  * The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c
>    are taken from libjpeg, see the top of the files for licensing details.
>  

-- 
Michel Bardiaux
R&D Director
T +32 [0] 2 790 29 41
F +32 [0] 2 790 29 02
E mailto:mbardiaux at mediaxim.be

Mediaxim NV/SA
Vorstlaan 191 Boulevard du Souverain
Brussel 1160 Bruxelles
http://www.mediaxim.com/