diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-05-07 17:11:22 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-05-07 17:11:22 +0200 |
| commit | 4527fd438b39dc312c69839f051e0a2ac0046356 (patch) | |
| tree | d3b2dc1f89617e86c619575e3324534c523ed673 /src/xine-utils/xine_buffer.c | |
| parent | 47c1651eb8c42ab6dddaff7c0663c45ac49b4fcf (diff) | |
| parent | 88d23a2dbabf419ab4014b449be119a741aa54f5 (diff) | |
| download | xine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.gz xine-lib-4527fd438b39dc312c69839f051e0a2ac0046356.tar.bz2 | |
Merge file removal.
Diffstat (limited to 'src/xine-utils/xine_buffer.c')
| -rw-r--r-- | src/xine-utils/xine_buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c index 190ab5197..097ca0f1f 100644 --- a/src/xine-utils/xine_buffer.c +++ b/src/xine-utils/xine_buffer.c @@ -117,7 +117,7 @@ typedef struct { */ void *xine_buffer_init(int chunk_size) { - uint8_t *data=xine_xmalloc(chunk_size+XINE_BUFFER_HEADER_SIZE); + uint8_t *data=calloc(1, chunk_size+XINE_BUFFER_HEADER_SIZE); xine_buffer_header_t *header=(xine_buffer_header_t*)data; header->size=chunk_size; @@ -162,7 +162,7 @@ void *xine_buffer_dup(const void *buf) { CHECK_MAGIC(buf); #endif -new=xine_xmalloc(GET_HEADER(buf)->size+XINE_BUFFER_HEADER_SIZE); + new = malloc(GET_HEADER(buf)->size+XINE_BUFFER_HEADER_SIZE); xine_fast_memcpy(new, ((uint8_t*)buf)-XINE_BUFFER_HEADER_SIZE, GET_HEADER(buf)->size+XINE_BUFFER_HEADER_SIZE); |