From fd3fe45bc14a0a540f2525102551c92a64a73b76 Mon Sep 17 00:00:00 2001 From: Robert Kukla Date: Tue, 9 Oct 2007 20:42:20 +0000 Subject: FS#7487 - mpegplayer - video start time seek with resume by John S. Gwynne & Brian J. Morey This should stop the patch from breaking again and give them opportunity to improve it further. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15052 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/mpegplayer/alloc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'apps/plugins/mpegplayer/alloc.c') diff --git a/apps/plugins/mpegplayer/alloc.c b/apps/plugins/mpegplayer/alloc.c index 0ba86a51f3..ae482de112 100644 --- a/apps/plugins/mpegplayer/alloc.c +++ b/apps/plugins/mpegplayer/alloc.c @@ -54,6 +54,8 @@ static void * mpeg_malloc_internal (unsigned char *mallocbuf, x = &mallocbuf[*mem_ptr]; *mem_ptr += (size + 3) & ~3; /* Keep memory 32-bit aligned */ + rb->memset(x,0,size); + return x; (void)reason; } @@ -116,7 +118,7 @@ void * mpeg2_malloc(unsigned size, mpeg2_alloc_t reason) void mpeg2_free(void *ptr) { - (void)ptr; + mpeg2_mem_ptr = (void *)ptr - (void *)mpeg2_mallocbuf; } /* The following are expected by libmad */ @@ -141,7 +143,7 @@ void * codec_calloc(size_t nmemb, size_t size) void codec_free(void* ptr) { - (void)ptr; + mem_ptr = (void *)ptr - (void *)mallocbuf; } void *memmove(void *dest, const void *src, size_t n) -- cgit v1.2.3