diff options
| author | Robert Kukla <roolku@rockbox.org> | 2007-10-09 20:42:20 +0000 |
|---|---|---|
| committer | Robert Kukla <roolku@rockbox.org> | 2007-10-09 20:42:20 +0000 |
| commit | fd3fe45bc14a0a540f2525102551c92a64a73b76 (patch) | |
| tree | 1ef8103bbfa5b33f684a94bddc5ecb4685ec5e88 /apps/plugins/mpegplayer/alloc.c | |
| parent | ce135909b9393d9824b3f69a70659400480cc069 (diff) | |
| download | rockbox-fd3fe45bc14a0a540f2525102551c92a64a73b76.zip rockbox-fd3fe45bc14a0a540f2525102551c92a64a73b76.tar.gz rockbox-fd3fe45bc14a0a540f2525102551c92a64a73b76.tar.bz2 rockbox-fd3fe45bc14a0a540f2525102551c92a64a73b76.tar.xz | |
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
Diffstat (limited to 'apps/plugins/mpegplayer/alloc.c')
| -rw-r--r-- | apps/plugins/mpegplayer/alloc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/plugins/mpegplayer/alloc.c b/apps/plugins/mpegplayer/alloc.c index 0ba86a5..ae482de 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) |