RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adapt the patch to more recent FFmpeg habits 

- Indentation
- Use av_log instead of fprintf
- Removed strdup of the device name. It was unused
- Cleaned things a bit
(patch by Edouard Gomez)

Originally committed as revision 7303 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Edouard Gomez 2006-12-13 08:46:31 +00:00 committed by Guillaume Poirier
parent f58f4ce19d
commit 2909f17717
1 changed files with 429 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
libavformat/x11grab.c
View File

@ -1,6 +1,6 @@
/* /*
* X11 video grab interface * X11 video grab interface
* Copyright (c) 2006 Clemens Fruhwirth * Copyright (C) 2006 Clemens Fruhwirth
* *
* A quick note on licensing. This file is a mixture of LGPL code * 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 * (ffmpeg) and GPL code (xvidcap). The result is a file that must
@ -42,6 +42,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include "avformat.h" #include "avformat.h"
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
@ -58,8 +59,8 @@
#include <sys/shm.h> #include <sys/shm.h>
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
typedef struct
typedef struct { {
Display *dpy; Display *dpy;
int frame_format; int frame_format;
int frame_size; int frame_size;
@ -77,66 +78,71 @@ typedef struct {
int mouse_wanted; int mouse_wanted;
} X11Grab; } X11Grab;
static int x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) static int
x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
{ {
X11Grab *x11grab = s1->priv_data; X11Grab *x11grab = s1->priv_data;
Display *dpy; Display *dpy;
AVStream *st; AVStream *st = NULL;
int width, height; int width, height;
int frame_rate, frame_rate_base, frame_size; int frame_rate, frame_rate_base, frame_size;
int input_pixfmt; int input_pixfmt;
XImage *image; XImage *image;
int x_off=0; int y_off = 0; int x_off=0; int y_off = 0;
char *device_parsing = strdup(ap->device);
int use_shm; int use_shm;
dpy = XOpenDisplay(NULL); dpy = XOpenDisplay(NULL);
if(!dpy) {
if(!dpy)
goto fail; goto fail;
}
sscanf(device_parsing,"x11:%d,%d",&x_off, &y_off); sscanf(ap->device, "x11:%d,%d", &x_off, &y_off);
fprintf(stderr,"device: %s -> x: %d y: %d width: %d height: %d\n", ap->device, x_off, y_off, ap->width, ap->height); av_log(s1, AV_LOG_INFO, "device: %s -> x: %d y: %d width: %d height: %d\n", ap->device, x_off, y_off, ap->width, ap->height);
if (!ap || ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) { if (!ap || ap->width <= 0 || ap->height <= 0 || ap->time_base.den <= 0) {
fprintf(stderr,"x11grab: AVParameters don't have any video size. Use -s.\n"); av_log(s1, AV_LOG_ERROR, "AVParameters don't have any video size. Use -s.\n");
return AVERROR_IO; return AVERROR_IO;
} }
width = ap->width; width = ap->width;
height = ap->height; height = ap->height;
frame_rate = ap->time_base.den; frame_rate = ap->time_base.den;
frame_rate_base = ap->time_base.num; frame_rate_base = ap->time_base.num;
st = av_new_stream(s1, 0); st = av_new_stream(s1, 0);
if (!st) if (!st) {
return -ENOMEM; return -ENOMEM;
}
av_set_pts_info(st, 48, 1, 1000000); /* 48 bits pts in us */ av_set_pts_info(st, 48, 1, 1000000); /* 48 bits pts in us */
use_shm = XShmQueryExtension(dpy); use_shm = XShmQueryExtension(dpy);
fprintf(stderr,"x11grab: shared memory extension %s\n",use_shm?"found":"not found"); av_log(s1, AV_LOG_INFO, "shared memory extension %s\n", use_shm ? "found" : "not found");
if(use_shm) { if(use_shm) {
int scr = XDefaultScreen(dpy); int scr = XDefaultScreen(dpy);
image = XShmCreateImage(dpy, image = XShmCreateImage(dpy,
DefaultVisual(dpy,scr), DefaultVisual(dpy,scr),
DefaultDepth(dpy,scr), DefaultDepth(dpy,scr),
ZPixmap, NULL, ZPixmap,
&x11grab->shminfo, ap->width, ap->height); NULL,
&x11grab->shminfo,
ap->width, ap->height);
x11grab->shminfo.shmid = shmget(IPC_PRIVATE, x11grab->shminfo.shmid = shmget(IPC_PRIVATE,
image->bytes_per_line * image->height, IPC_CREAT|0777); image->bytes_per_line * image->height,
IPC_CREAT|0777);
if (x11grab->shminfo.shmid == -1) { if (x11grab->shminfo.shmid == -1) {
fprintf(stderr,"Fatal: Can't get shared memory!\n"); av_log(s1, AV_LOG_ERROR, "Fatal: Can't get shared memory!\n");
return -ENOMEM; return -ENOMEM;
} }
x11grab->shminfo.shmaddr = image->data = shmat(x11grab->shminfo.shmid, 0, 0); x11grab->shminfo.shmaddr = image->data = shmat(x11grab->shminfo.shmid, 0, 0);
x11grab->shminfo.readOnly = False; x11grab->shminfo.readOnly = False;
if (XShmAttach(dpy, &x11grab->shminfo) == 0) { if (!XShmAttach(dpy, &x11grab->shminfo)) {
fprintf(stderr,"Fatal: Failed to attach shared memory!\n"); av_log(s1, AV_LOG_ERROR, "Fatal: Failed to attach shared memory!\n");
/* needs some better error subroutine :) */ /* needs some better error subroutine :) */
return AVERROR_IO; return AVERROR_IO;
} }
} } else {
else {
image = XGetImage(dpy, RootWindow(dpy, DefaultScreen(dpy)), image = XGetImage(dpy, RootWindow(dpy, DefaultScreen(dpy)),
x_off,y_off, x_off,y_off,
ap->width,ap->height, ap->width,ap->height,
@ -145,22 +151,22 @@ static int x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
switch (image->bits_per_pixel) { switch (image->bits_per_pixel) {
case 8: case 8:
fprintf (stderr, "x11grab: 8 bit pallete\n"); av_log (s1, AV_LOG_DEBUG, "8 bit pallete\n");
input_pixfmt = PIX_FMT_PAL8; input_pixfmt = PIX_FMT_PAL8;
break; break;
case 16: case 16:
if ( image->red_mask == 0xF800 && image->green_mask == 0x07E0 if ( image->red_mask == 0xF800 && image->green_mask == 0x07E0
&& image->blue_mask == 0x1F ) { && image->blue_mask == 0x1F ) {
fprintf (stderr, "x11grab: 16 bit RGB565\n"); av_log (s1, AV_LOG_DEBUG, "16 bit RGB565\n");
input_pixfmt = PIX_FMT_RGB565; input_pixfmt = PIX_FMT_RGB565;
} else if ( image->red_mask == 0x7C00 && } else if ( image->red_mask == 0x7C00 &&
image->green_mask == 0x03E0 && image->green_mask == 0x03E0 &&
image->blue_mask == 0x1F ) { image->blue_mask == 0x1F ) {
fprintf (stderr, "x11grab: 16 bit RGB555\n"); av_log(s1, AV_LOG_DEBUG, "16 bit RGB555\n");
input_pixfmt = PIX_FMT_RGB555; input_pixfmt = PIX_FMT_RGB555;
} else { } else {
fprintf (stderr, "x11grab: RGB ordering at image depth %i not supported ... aborting\n", image->bits_per_pixel); av_log(s1, AV_LOG_ERROR, "RGB ordering at image depth %i not supported ... aborting\n", image->bits_per_pixel);
fprintf (stderr, "x11grab: color masks: r 0x%.6X g 0x%.6X b 0x%.6X\n", image->red_mask, image->green_mask, image->blue_mask); av_log(s1, AV_LOG_ERROR, "color masks: r 0x%.6lx g 0x%.6lx b 0x%.6lx\n", image->red_mask, image->green_mask, image->blue_mask);
return AVERROR_IO; return AVERROR_IO;
} }
break; break;
@ -173,8 +179,8 @@ static int x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
&& image->blue_mask == 0xFF0000 ) { && image->blue_mask == 0xFF0000 ) {
input_pixfmt = PIX_FMT_RGB24; input_pixfmt = PIX_FMT_RGB24;
} else { } else {
fprintf (stderr, "xtoffmpeg.XImageToFFMPEG(): rgb ordering at image depth %i not supported ... aborting\n", image->bits_per_pixel); av_log(s1, AV_LOG_ERROR,"rgb ordering at image depth %i not supported ... aborting\n", image->bits_per_pixel);
fprintf (stderr, "xtoffmpeg.XImageToFFMPEG(): color masks: r 0x%.6X g 0x%.6X b 0x%.6X\n", image->red_mask, image->green_mask, image->blue_mask); av_log(s1, AV_LOG_ERROR, "color masks: r 0x%.6lx g 0x%.6lx b 0x%.6lx\n", image->red_mask, image->green_mask, image->blue_mask);
return AVERROR_IO; return AVERROR_IO;
} }
break; break;
@ -190,14 +196,14 @@ static int x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
// this matches both ARGB32 and ABGR32 // this matches both ARGB32 and ABGR32
input_pixfmt = PIX_FMT_ARGB32; input_pixfmt = PIX_FMT_ARGB32;
} else { } else {
fprintf (stderr, "xtoffmpeg.XImageToFFMPEG(): image depth %i not supported ... aborting\n", image->bits_per_pixel); av_log(s1, AV_LOG_ERROR,"image depth %i not supported ... aborting\n", image->bits_per_pixel);
return AVERROR_IO; return AVERROR_IO;
} }
#endif #endif
input_pixfmt = PIX_FMT_RGBA32; input_pixfmt = PIX_FMT_RGBA32;
break; break;
default: default:
fprintf (stderr, "xtoffmpeg.XImageToFFMPEG(): image depth %i not supported ... aborting\n", image->bits_per_pixel); av_log(s1, AV_LOG_ERROR, "image depth %i not supported ... aborting\n", image->bits_per_pixel);
return -1; return -1;
} }
@ -227,16 +233,24 @@ static int x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
return 0; return 0;
fail: fail:
av_free(st); av_free(st);
av_free(device_parsing);
return AVERROR_IO; return AVERROR_IO;
} }
uint16_t mousePointerBlack[] = { 0, 49152, 40960, 36864, 34816, 33792, 33280, 33024, 32896, 32832, static const uint16_t mousePointerBlack[] =
33728, 37376, 43264, 51456, 1152, 1152, 576, 576, 448, 0 }; {
uint16_t mousePointerWhite[] = { 0, 0, 16384, 24576, 28672, 30720, 31744, 32256, 32512, 32640, 31744, 0, 49152, 40960, 36864, 34816, 33792, 33280, 33024, 32896, 32832,
27648, 17920, 1536, 768, 768, 384, 384, 0, 0 }; 33728, 37376, 43264, 51456, 1152, 1152, 576, 576, 448, 0
};
static void getCurrentPointer(X11Grab *s, int *x, int *y) { static const uint16_t mousePointerWhite[] =
{
0, 0, 16384, 24576, 28672, 30720, 31744, 32256, 32512, 32640, 31744,
27648, 17920, 1536, 768, 768, 384, 384, 0, 0
};
static void
getCurrentPointer(AVFormatContext *s1, X11Grab *s, int *x, int *y)
{
Window mrootwindow, childwindow; Window mrootwindow, childwindow;
int dummy; int dummy;
Display *dpy = s->dpy; Display *dpy = s->dpy;
@ -244,26 +258,26 @@ static void getCurrentPointer(X11Grab *s, int *x, int *y) {
mrootwindow = DefaultRootWindow(dpy); mrootwindow = DefaultRootWindow(dpy);
if (XQueryPointer(dpy, mrootwindow, &mrootwindow, &childwindow, if (XQueryPointer(dpy, mrootwindow, &mrootwindow, &childwindow,
x, y, &dummy, &dummy, &dummy)) { x, y, &dummy, &dummy, (unsigned int*)&dummy)) {
} else { } else {
fprintf(stderr,"couldn't find mouse pointer\n"); av_log(s1, AV_LOG_INFO, "couldn't find mouse pointer\n");
*x = -1; *x = -1;
*y = -1; *y = -1;
} }
} }
static void paintMousePointer(X11Grab *s, int *x, int *y, XImage *image) { static void
paintMousePointer(AVFormatContext *s1, X11Grab *s, int *x, int *y, XImage *image)
{
int x_off = s->x_off; int x_off = s->x_off;
int y_off = s->y_off; int y_off = s->y_off;
int width = s->width; int width = s->width;
int height = s->height; int height = s->height;
if ((*x - x_off) >= 0 && if ( (*x - x_off) >= 0 && *x < (width + x_off)
*x < (width + x_off) && && (*y - y_off) >= 0 && *y < (height + y_off) ) {
(*y - y_off) >= 0 &&
*y < (height + y_off) ) {
int line; int line;
uint8_t *im_data = image->data; uint8_t *im_data = (uint8_t*)image->data;
im_data += (image->bytes_per_line * (*y - y_off)); // shift to right line im_data += (image->bytes_per_line * (*y - y_off)); // shift to right line
im_data += (image->bits_per_pixel / 8 * (*x - x_off)); // shift to right pixel im_data += (image->bits_per_pixel / 8 * (*x - x_off)); // shift to right pixel
@ -275,7 +289,7 @@ static void paintMousePointer(X11Grab *s, int *x, int *y, XImage *image) {
int width_cursor; int width_cursor;
uint16_t bm_b, bm_w, mask; uint16_t bm_b, bm_w, mask;
for (line = 0; line < 20; line++ ) { for (line = 0; line < min(20, (y_off + height) - *y); line++ ) {
if (s->mouse_wanted == 1) { if (s->mouse_wanted == 1) {
bm_b = mousePointerBlack[line]; bm_b = mousePointerBlack[line];
bm_w = mousePointerWhite[line]; bm_w = mousePointerWhite[line];
@ -292,11 +306,14 @@ static void paintMousePointer(X11Grab *s, int *x, int *y, XImage *image) {
// pointer_b_bit = ( ( bm_b & mask ) > 0 ); // pointer_b_bit = ( ( bm_b & mask ) > 0 );
// pointer_w_bit = ( ( bm_w & mask ) > 0 ); // pointer_w_bit = ( ( bm_w & mask ) > 0 );
// printf("%i ", pointer_b_bit, pointer_w_bit ); // printf("%i ", pointer_b_bit, pointer_w_bit );
if (( bm_b & mask) > 0 ) { if (( bm_b & mask) > 0 ) {
*cursor &= ((~ image->red_mask) & (~ image->green_mask) & (~image->blue_mask )); *cursor &= ( (~image->red_mask)
& (~image->green_mask)
& (~image->blue_mask));
} else if (( bm_w & mask) > 0 ) { } else if (( bm_w & mask) > 0 ) {
*cursor |= (image->red_mask | image->green_mask | image->blue_mask ); *cursor |= ( image->red_mask
| image->green_mask
| image->blue_mask );
} }
mask >>= 1; mask >>= 1;
} }
@ -307,12 +324,13 @@ static void paintMousePointer(X11Grab *s, int *x, int *y, XImage *image) {
break; break;
#if 0 #if 0
case 24: // not sure this can occur at all .......... case 24: // not sure this can occur at all ..........
fprintf(stderr,"input image bits_per_pixel %i not implemented with mouse pointer capture ... aborting!\n", av_log(s1, AV_LOG_ERROR, "input image bits_per_pixel %i not implemented with mouse pointer capture ... aborting!\n",
image->bits_per_pixel); image->bits_per_pixel);
fprintf(stderr,"Please file a bug at http://www.sourceforge.net/projects/xvidcap/\n"); av_log(s1, AV_LOG_ERROR, "Please file a bug at http://www.sourceforge.net/projects/xvidcap/\n");
exit(1); exit(1);
break; break;
case 16: { case 16:
{
uint16_t *cursor; uint16_t *cursor;
int width; int width;
uint16_t bm_b, bm_w, mask; uint16_t bm_b, bm_w, mask;
@ -331,19 +349,19 @@ static void paintMousePointer(X11Grab *s, int *x, int *y, XImage *image) {
((width + *x) < (mjob->area->width + mjob->area->x)&&width < 6); ((width + *x) < (mjob->area->width + mjob->area->x)&&width < 6);
cursor++, width++) { cursor++, width++) {
// Boolean pointer_b_bit, pointer_w_bit; // Boolean pointer_b_bit, pointer_w_bit;
// pointer_b_bit = ( ( bm_b & mask ) > 0 ); // pointer_b_bit = ( ( bm_b & mask ) > 0 );
// pointer_w_bit = ( ( bm_w & mask ) > 0 ); // pointer_w_bit = ( ( bm_w & mask ) > 0 );
// printf("%i ", pointer_b_bit, pointer_w_bit ); // printf("%i ", pointer_b_bit, pointer_w_bit );
if (( bm_b & mask ) > 0 ) { if (( bm_b & mask ) > 0 ) {
*cursor &= ((~ image->red_mask) & (~ image->green_mask) & (~ *cursor &= ( (~image->red_mask)
image->blue_mask )); & (~image->green_mask)
& (~image->blue_mask));
} else if (( bm_w & mask ) > 0 ) { } else if (( bm_w & mask ) > 0 ) {
*cursor |= (image->red_mask | image->green_mask | image->blue_mask ); *cursor |= ( image->red_mask
| image->green_mask
| image->blue_mask );
} }
mask >>= 1; mask >>= 1;
} }
// printf("\n"); // printf("\n");
@ -351,7 +369,8 @@ static void paintMousePointer(X11Grab *s, int *x, int *y, XImage *image) {
} }
} }
break; break;
case 8: { case 8:
{
uint8_t *cursor; uint8_t *cursor;
int width; int width;
uint16_t bm_b, bm_w, mask; uint16_t bm_b, bm_w, mask;
@ -370,11 +389,9 @@ static void paintMousePointer(X11Grab *s, int *x, int *y, XImage *image) {
((width + *x) < (mjob->area->width + mjob->area->x)&&width < 6); ((width + *x) < (mjob->area->width + mjob->area->x)&&width < 6);
cursor++, width++) { cursor++, width++) {
// Boolean pointer_b_bit, pointer_w_bit; // Boolean pointer_b_bit, pointer_w_bit;
// pointer_b_bit = ( ( bm_b & mask ) > 0 ); // pointer_b_bit = ( ( bm_b & mask ) > 0 );
// pointer_w_bit = ( ( bm_w & mask ) > 0 ); // pointer_w_bit = ( ( bm_w & mask ) > 0 );
// printf("%i ", pointer_b_bit, pointer_w_bit ); // printf("%i ", pointer_b_bit, pointer_w_bit );
if ((bm_b & mask) > 0 ) { if ((bm_b & mask) > 0 ) {
*cursor = 0; *cursor = 0;
} else if (( bm_w & mask) > 0 ) { } else if (( bm_w & mask) > 0 ) {
@ -390,7 +407,7 @@ static void paintMousePointer(X11Grab *s, int *x, int *y, XImage *image) {
} }
break; break;
default: default:
fprintf(stderr,"input image bits_per_pixel %i not supported with mouse pointer capture ... aborting!\n", av_log(s1, AV_LOG_ERROR, "input image bits_per_pixel %i not supported with mouse pointer capture ... aborting!\n",
image->bits_per_pixel); image->bits_per_pixel);
exit(1); exit(1);
@ -411,26 +428,26 @@ XGetZPixmap(Display *dpy, Drawable d, XImage *image, int x, int y)
xGetImageReq *req; xGetImageReq *req;
long nbytes; long nbytes;
if (!image) if (!image) {
return (False); return False;
}
LockDisplay(dpy); LockDisplay(dpy);
GetReq(GetImage, req); GetReq(GetImage, req);
/*
* first set up the standard stuff in the request /* First set up the standard stuff in the request */
*/
req->drawable = d; req->drawable = d;
req->x = x; req->x = x;
req->y = y; req->y = y;
req->width = image->width; req->width = image->width;
req->height = image->height; req->height = image->height;
req->planeMask = AllPlanes; req->planeMask = (unsigned int)AllPlanes;
req->format = ZPixmap; req->format = ZPixmap;
if (_XReply(dpy, (xReply *) &rep, 0, xFalse) == 0 || if (!_XReply(dpy, (xReply *) &rep, 0, xFalse) || !rep.length) {
rep.length == 0) {
UnlockDisplay(dpy); UnlockDisplay(dpy);
SyncHandle(); SyncHandle();
return (False); return False;
} }
nbytes = (long)rep.length << 2; nbytes = (long)rep.length << 2;
@ -438,7 +455,7 @@ XGetZPixmap(Display *dpy, Drawable d, XImage *image, int x, int y)
UnlockDisplay(dpy); UnlockDisplay(dpy);
SyncHandle(); SyncHandle();
return (True); return True;
} }
static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt) static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
@ -461,7 +478,7 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
delay = s->time_frame * s->frame_rate_base / s->frame_rate - curtime; delay = s->time_frame * s->frame_rate_base / s->frame_rate - curtime;
if (delay <= 0) { if (delay <= 0) {
if (delay < int64_t_C(-1000000) * s->frame_rate_base / s->frame_rate) { if (delay < int64_t_C(-1000000) * s->frame_rate_base / s->frame_rate) {
/* printf("grabbing is %d frames late (dropping)\n", (int) -(delay / 16666)); */ av_log(s1, AV_LOG_DEBUG, "grabbing is %d frames late (dropping)\n", (int) -(delay / 16666));
s->time_frame += int64_t_C(1000000); s->time_frame += int64_t_C(1000000);
} }
break; break;
@ -471,27 +488,26 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
nanosleep(&ts, NULL); nanosleep(&ts, NULL);
} }
if (av_new_packet(pkt, s->frame_size) < 0) if (av_new_packet(pkt, s->frame_size) < 0) {
return AVERROR_IO; return AVERROR_IO;
}
pkt->pts = curtime & ((1LL << 48) - 1); pkt->pts = curtime & ((1LL << 48) - 1);
if(s->use_shm) { if(s->use_shm) {
if (!XShmGetImage(dpy, if (!XShmGetImage(dpy, RootWindow(dpy, DefaultScreen(dpy)), image, x_off, y_off, AllPlanes)) {
RootWindow(dpy, DefaultScreen(dpy)), av_log (s1, AV_LOG_INFO, "XShmGetImage() failed\n");
image, x_off, y_off, AllPlanes)) { }
fprintf(stderr,"XShmGetImage() failed\n"); } else {
if (!XGetZPixmap(dpy, RootWindow(dpy, DefaultScreen(dpy)), image, x_off, y_off)) {
av_log (s1, AV_LOG_INFO, "XGetZPixmap() failed\n");
} }
} }
else {
XGetZPixmap(dpy,
RootWindow(dpy, DefaultScreen(dpy)),
image, x_off, y_off);
};
{ {
int pointer_x, pointer_y; int pointer_x, pointer_y;
getCurrentPointer(s, &pointer_x, &pointer_y); getCurrentPointer(s1, s, &pointer_x, &pointer_y);
paintMousePointer(s, &pointer_x, &pointer_y, image); paintMousePointer(s1, s, &pointer_x, &pointer_y, image);
} }
#warning FIXME - avoid memcpy #warning FIXME - avoid memcpy
@ -502,14 +518,14 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
static int x11grab_read_close(AVFormatContext *s1) static int x11grab_read_close(AVFormatContext *s1)
{ {
X11Grab *x11grab = s1->priv_data; X11Grab *x11grab = s1->priv_data;
XCloseDisplay(x11grab->dpy); XCloseDisplay(x11grab->dpy);
return 0; return 0;
} }
AVInputFormat x11_grab_device_demuxer = { AVInputFormat x11_grab_device_demuxer =
{
"x11grab", "x11grab",
"X11grab", "X11 frame graber",
sizeof(X11Grab), sizeof(X11Grab),
NULL, NULL,
x11grab_read_header, x11grab_read_header,