kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 22:45:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

free memory used by the x11 grabber when closing it.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@130733 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2008-07-14 16:50:54 +00:00
parent 6b9e40282e
commit 3e9a95c16b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/vgrabbers.c
View File

@@ -69,6 +69,8 @@ struct grab_x11_desc {
struct fbuf_t b; /* geometry and pointer into the XImage */ struct fbuf_t b; /* geometry and pointer into the XImage */
}; };
static void *grab_x11_close(void *desc); /* forward declaration */
/*! \brief open the grabber. /*! \brief open the grabber.
* We use the special name 'X11' to indicate this grabber. * We use the special name 'X11' to indicate this grabber.
*/ */
@@ -127,12 +129,7 @@ static void *grab_x11_open(const char *name, struct fbuf_t *geom, int fps)
return v; return v;
error: error:
/* XXX maybe XDestroy (v->image) ? */ return grab_x11_close(v);
if (v->dpy)
XCloseDisplay(v->dpy);
v->dpy = NULL;
ast_free(v);
return NULL;
} }
static struct fbuf_t *grab_x11_read(void *desc) static struct fbuf_t *grab_x11_read(void *desc)
@@ -170,6 +167,7 @@ static void *grab_x11_close(void *desc)
{ {
struct grab_x11_desc *v = desc; struct grab_x11_desc *v = desc;
if (v->dpy)
XCloseDisplay(v->dpy); XCloseDisplay(v->dpy);
v->dpy = NULL; v->dpy = NULL;
v->image = NULL; v->image = NULL;