diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-05-09 15:55:33 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-05-09 15:55:33 +0200 |
| commit | 1e71123be300aa08325aca68f12d54e7149bd820 (patch) | |
| tree | 00f2e457fd5a860d70deb5008eb44c60da0dbbde /src/xine-engine/alphablend.c | |
| parent | c99cd9519a56b2d7c60fa30e9fecd02f08336671 (diff) | |
| download | xine-lib-1e71123be300aa08325aca68f12d54e7149bd820.tar.gz xine-lib-1e71123be300aa08325aca68f12d54e7149bd820.tar.bz2 | |
Remove a new bunch of xine_malloc() calls.
Also don't reset memory after it's allocated if we do that with
calloc.
Diffstat (limited to 'src/xine-engine/alphablend.c')
| -rw-r--r-- | src/xine-engine/alphablend.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c index a7ab33cf8..6f3ac3ebe 100644 --- a/src/xine-engine/alphablend.c +++ b/src/xine-engine/alphablend.c @@ -1110,12 +1110,12 @@ static uint8_t *(*blend_yuv_grow_extra_data(alphablend_t *extra_data, int osd_wi uint8_t *data[ 3 ][ 2 ]; } *header = (struct header_s *)extra_data->buffer; - int needed_buffer_size = sizeof (*header) + osd_width * sizeof (uint8_t[ 3 ][ 2 ]); + size_t needed_buffer_size = sizeof (*header) + osd_width * sizeof (uint8_t[ 3 ][ 2 ]); if (extra_data->buffer_size < needed_buffer_size) { free(extra_data->buffer); - header = xine_xmalloc(needed_buffer_size); + header = calloc(1, needed_buffer_size); if (!header) { extra_data->buffer_size = 0; return 0; @@ -1552,12 +1552,12 @@ static uint8_t *(*blend_yuy2_grow_extra_data(alphablend_t *extra_data, int osd_w uint8_t *data[ 3 ]; } *header = (struct header_s *)extra_data->buffer; - int needed_buffer_size = sizeof (*header) + osd_width * sizeof (uint8_t[ 3 ]); + size_t needed_buffer_size = sizeof (*header) + osd_width * sizeof (uint8_t[ 3 ]); if (extra_data->buffer_size < needed_buffer_size) { free(extra_data->buffer); - header = xine_xmalloc(needed_buffer_size); + header = calloc(1, needed_buffer_size); if (!header) { extra_data->buffer_size = 0; return 0; |