[Ffmpeg-devel] [RFC] X11 device demuxer

[Diego Biurrun]

On Tue, Nov 14, 2006 at 08:43:23PM +0000, Edouard Gomez wrote:
> Adds X11 frame demuxer capabilities.
> 
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/libavformat/x11grab.c	Tue Nov 14 21:38:29 2006 +0100
> @@ -0,0 +1,527 @@
> +/*
> + * X11 video grab interface
> + * Copyright (C) 2006 Clemens Fruhwirth
> + *
> + * A quick note on licensing. This file is a mixture of LGPL code
> + * (ffmpeg) and GPL code (xvidcap). The result is a file that must
> + * abid both licenses. As they are compatible and GPL is more
> + * strict, this code has an "effective" GPL license.

No, the result is that the file must be placed under the intersection,
not the union of both licenses, i.e. the GPL, not the LGPL.

> + * This program 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.

Replace "this program" with FFmpeg as the other license headers do.

Diego