summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-10-29 20:15:11 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-10-29 20:15:11 -0700
commitda3f8656744f7c801608c7c89a859c0f7dc9e6e0 (patch)
tree237b6a82fcd617e96b324a42a63dc7a8da16eb1a
parent17ba07a7befc7f442ae1c917a087ac026516d886 (diff)
Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/legacy/i810/xvmc/I810XvMC.c2
-rw-r--r--src/xvmc/i965_xvmc.c2
-rw-r--r--src/xvmc/intel_xvmc.c2
-rw-r--r--src/xvmc/xvmc_vld.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/legacy/i810/xvmc/I810XvMC.c b/src/legacy/i810/xvmc/I810XvMC.c
index 0754ff44..e6b63d30 100644
--- a/src/legacy/i810/xvmc/I810XvMC.c
+++ b/src/legacy/i810/xvmc/I810XvMC.c
@@ -4323,7 +4323,7 @@ static XvAttribute I810_XVMC_ATTRIBUTES[] = {
// Function: XvMCQueryAttributes
// Description: An array of XvAttributes of size "number" is returned by
// this function. If there are no attributes, NULL is returned and number
-// is set to 0. The array may be freed with xfree().
+// is set to 0. The array may be freed with free().
//
// Arguments:
// display - Connection to the X server.
diff --git a/src/xvmc/i965_xvmc.c b/src/xvmc/i965_xvmc.c
index 210cf731..261cf35e 100644
--- a/src/xvmc/i965_xvmc.c
+++ b/src/xvmc/i965_xvmc.c
@@ -244,7 +244,7 @@ static Status destroy_context(Display * display, XvMCContext * context)
{
struct intel_xvmc_context *intel_ctx;
intel_ctx = context->privData;
- Xfree(intel_ctx->hw);
+ free(intel_ctx->hw);
free(intel_ctx);
return Success;
}
diff --git a/src/xvmc/intel_xvmc.c b/src/xvmc/intel_xvmc.c
index 1b969457..883dadae 100644
--- a/src/xvmc/intel_xvmc.c
+++ b/src/xvmc/intel_xvmc.c
@@ -972,7 +972,7 @@ _X_EXPORT Status XvMCGetSubpictureStatus(Display * display,
* Function: XvMCQueryAttributes
* Description: An array of XvAttributes of size "number" is returned by
* this function. If there are no attributes, NULL is returned and number
- * is set to 0. The array may be freed with xfree().
+ * is set to 0. The array may be freed with free().
*
* Arguments:
* display - Connection to the X server.
diff --git a/src/xvmc/xvmc_vld.c b/src/xvmc/xvmc_vld.c
index 570e9b65..3f5fa5e1 100644
--- a/src/xvmc/xvmc_vld.c
+++ b/src/xvmc/xvmc_vld.c
@@ -622,7 +622,7 @@ static Status destroy_context(Display * display, XvMCContext * context)
{
struct intel_xvmc_context *intel_ctx;
intel_ctx = context->privData;
- Xfree(intel_ctx->hw);
+ free(intel_ctx->hw);
free(intel_ctx);
return Success;
}