summaryrefslogtreecommitdiff
path: root/Xext/xvmain.c
diff options
context:
space:
mode:
Diffstat (limited to 'Xext/xvmain.c')
-rw-r--r--Xext/xvmain.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 05a68907a..13cd600a1 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -277,7 +277,7 @@ XvScreenInit(ScreenPtr pScreen)
/* ALLOCATE SCREEN PRIVATE RECORD */
- pxvs = xalloc (sizeof (XvScreenRec));
+ pxvs = malloc(sizeof (XvScreenRec));
if (!pxvs)
{
ErrorF("XvScreenInit: Unable to allocate screen private structure\n");
@@ -314,7 +314,7 @@ XvCloseScreen(
(* pxvs->ddCloseScreen)(ii, pScreen);
- xfree(pxvs);
+ free(pxvs);
dixSetPrivate(&pScreen->devPrivates, XvScreenKey, NULL);
@@ -509,7 +509,7 @@ XvdiDestroyVideoNotifyList(pointer pn, XID id)
{
npn = cpn->next;
if (cpn->client) FreeResource(cpn->id, XvRTVideoNotify);
- xfree(cpn);
+ free(cpn);
cpn = npn;
}
return Success;
@@ -928,12 +928,12 @@ XvdiSelectVideoNotify(
if (!pn)
{
- if (!(tpn = xalloc(sizeof(XvVideoNotifyRec))))
+ if (!(tpn = malloc(sizeof(XvVideoNotifyRec))))
return BadAlloc;
tpn->next = NULL;
if (!AddResource(pDraw->id, XvRTVideoNotifyList, tpn))
{
- xfree(tpn);
+ free(tpn);
return BadAlloc;
}
}
@@ -966,7 +966,7 @@ XvdiSelectVideoNotify(
}
else
{
- if (!(tpn = xalloc(sizeof(XvVideoNotifyRec))))
+ if (!(tpn = malloc(sizeof(XvVideoNotifyRec))))
return BadAlloc;
tpn->next = pn->next;
pn->next = tpn;
@@ -1024,7 +1024,7 @@ XvdiSelectPortNotify(
if (!tpn)
{
- if (!(tpn = xalloc(sizeof(XvPortNotifyRec))))
+ if (!(tpn = malloc(sizeof(XvPortNotifyRec))))
return BadAlloc;
tpn->next = pPort->pNotify;
pPort->pNotify = tpn;