summaryrefslogtreecommitdiff
path: root/apps/plugins/mpegplayer/alloc.c
diff options
context:
space:
mode:
authorRobert Kukla <roolku@rockbox.org>2007-10-09 20:42:20 +0000
committerRobert Kukla <roolku@rockbox.org>2007-10-09 20:42:20 +0000
commitfd3fe45bc14a0a540f2525102551c92a64a73b76 (patch)
tree1ef8103bbfa5b33f684a94bddc5ecb4685ec5e88 /apps/plugins/mpegplayer/alloc.c
parentce135909b9393d9824b3f69a70659400480cc069 (diff)
downloadrockbox-fd3fe45bc14a0a540f2525102551c92a64a73b76.tar.gz
rockbox-fd3fe45bc14a0a540f2525102551c92a64a73b76.zip
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.c6
1 files changed, 4 insertions, 2 deletions
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,
54 x = &mallocbuf[*mem_ptr]; 54 x = &mallocbuf[*mem_ptr];
55 *mem_ptr += (size + 3) & ~3; /* Keep memory 32-bit aligned */ 55 *mem_ptr += (size + 3) & ~3; /* Keep memory 32-bit aligned */
56 56
57 rb->memset(x,0,size);
58
57 return x; 59 return x;
58 (void)reason; 60 (void)reason;
59} 61}
@@ -116,7 +118,7 @@ void * mpeg2_malloc(unsigned size, mpeg2_alloc_t reason)
116 118
117void mpeg2_free(void *ptr) 119void mpeg2_free(void *ptr)
118{ 120{
119 (void)ptr; 121 mpeg2_mem_ptr = (void *)ptr - (void *)mpeg2_mallocbuf;
120} 122}
121 123
122/* The following are expected by libmad */ 124/* The following are expected by libmad */
@@ -141,7 +143,7 @@ void * codec_calloc(size_t nmemb, size_t size)
141 143
142void codec_free(void* ptr) 144void codec_free(void* ptr)
143{ 145{
144 (void)ptr; 146 mem_ptr = (void *)ptr - (void *)mallocbuf;
145} 147}
146 148
147void *memmove(void *dest, const void *src, size_t n) 149void *memmove(void *dest, const void *src, size_t n)