[FFmpeg-devel] Fwd: framebuffer device demuxer

[Diego Biurrun]

On Sun, Jan 23, 2011 at 04:34:26PM +0100, Vitor Sessak wrote:
>
> Git-friendly patch attached so patchwork will catch it up.
>
> --- a/configure
> +++ b/configure
> @@ -813,6 +814,7 @@ CONFIG_LIST="
>      static
>      swscale_alpha
>      x11grab
> +    fbgrab
>      zlib
>  "

alphabetical order

> @@ -1137,6 +1139,8 @@ vfwcap_demuxer_deps="capCreateCaptureWindow"
>  vfwcap_demuxer_extralibs="-lvfw32"
>  x11_grab_device_demuxer_deps="x11grab XShmCreateImage"
>  x11_grab_device_demuxer_extralibs="-lX11 -lXext"
> +fb_grab_device_demuxer_deps="fbgrab"
> +fb_grab_device_demuxer_extralibs="-lz"

alphabetical order

> --- a/libavdevice/Makefile
> +++ b/libavdevice/Makefile
> @@ -19,6 +19,7 @@ OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o
>  OBJS-$(CONFIG_V4L_DEMUXER)               += v4l.o
>  OBJS-$(CONFIG_VFWCAP_DEMUXER)            += vfwcap.o
>  OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.o
> +OBJS-$(CONFIG_FB_GRAB_DEVICE_DEMUXER)    += fbgrab.o

alphabetical order

> --- a/libavdevice/alldevices.c
> +++ b/libavdevice/alldevices.c
> @@ -54,6 +54,7 @@ void avdevice_register_all(void)
>      REGISTER_DEMUXER  (V4L, v4l);
>      REGISTER_DEMUXER  (VFWCAP, vfwcap);
>      REGISTER_DEMUXER  (X11_GRAB_DEVICE, x11_grab_device);
> +    REGISTER_DEMUXER  (FB_GRAB_DEVICE, fb_grab_device);

alphabetical order

> --- /dev/null
> +++ b/libavdevice/fbgrab.c
> @@ -0,0 +1,238 @@
> +/*
> + * fbgrab - framebuffer video grab interface
> + *
> + * (C) Giliard B. de Freitas <giliarde at gmail.com> 2009
> + *
> + * This file contains code from fbgrab.c:
> + * Copyright (C) 2002 Gunnar Monell <gmo at linux.nu> 2002
> + *
> + * This file contains code from the x11grab.c:
> + * Copyright (C) 2006 Clemens Fruhwirth <clemens at endorphin.org>
> + *                    Edouard Gomez <ed.gomez at free.fr>
> + *
> + * fbgrab 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.
> + *
> + * fbgrab 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 fbgrab; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */

Hmm, GPL code.  We'd need to decide what to do about this.

> +/**
> + * @file fbgrab.c

Drop the filename.