diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-01-11 16:19:21 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-01-11 16:19:21 +0000 |
| commit | e37a3aed95ea91a7ddbabc4bed1fac7c451fe695 (patch) | |
| tree | 9efa59fb8015a58146d7a50a3b6039e5fbe3a60d /src/libXvMC/block.c | |
| parent | 61e843ff4bf9b9e8c4a7a8a485cee852a4f1dd86 (diff) | |
| parent | 83a525af95bbb8012b9d7ee6b766621d6bb2d701 (diff) | |
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Diffstat (limited to 'src/libXvMC/block.c')
| -rw-r--r-- | src/libXvMC/block.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libXvMC/block.c b/src/libXvMC/block.c index 328b035576..b38a89be09 100644 --- a/src/libXvMC/block.c +++ b/src/libXvMC/block.c @@ -1,7 +1,7 @@ #include <assert.h> -#include <stdlib.h> #include <X11/Xlib.h> #include <X11/extensions/XvMC.h> +#include <util/u_memory.h> #include <vl_display.h> #include <vl_screen.h> #include <vl_context.h> @@ -26,7 +26,7 @@ Status XvMCCreateBlocks(Display *display, XvMCContext *context, unsigned int num blocks->context_id = context->context_id; blocks->num_blocks = num_blocks; - blocks->blocks = malloc(BLOCK_SIZE * num_blocks); + blocks->blocks = MALLOC(BLOCK_SIZE * num_blocks); /* Since we don't have a VL type for blocks, set privData to the display so we can catch mismatches */ blocks->privData = display; @@ -38,7 +38,7 @@ Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *blocks) assert(display); assert(blocks); assert(display == blocks->privData); - free(blocks->blocks); + FREE(blocks->blocks); return Success; } @@ -61,7 +61,7 @@ Status XvMCCreateMacroBlocks(Display *display, XvMCContext *context, unsigned in blocks->context_id = context->context_id; blocks->num_blocks = num_blocks; - blocks->macro_blocks = malloc(sizeof(XvMCMacroBlock) * num_blocks); + blocks->macro_blocks = MALLOC(sizeof(XvMCMacroBlock) * num_blocks); /* Since we don't have a VL type for blocks, set privData to the display so we can catch mismatches */ blocks->privData = display; @@ -73,7 +73,7 @@ Status XvMCDestroyMacroBlocks(Display *display, XvMCMacroBlockArray *blocks) assert(display); assert(blocks); assert(display == blocks->privData); - free(blocks->macro_blocks); + FREE(blocks->macro_blocks); return Success; } |