summaryrefslogtreecommitdiff
path: root/apps/codecs/lib
diff options
context:
space:
mode:
authorMagnus Holmgren <magnushol@gmail.com>2005-09-18 12:44:27 +0000
committerMagnus Holmgren <magnushol@gmail.com>2005-09-18 12:44:27 +0000
commitf5ec0fa592f9e23625de38673d22c4c7ee0fdfad (patch)
tree76915ace39025c5bcecaaef658622a25e5fd25f5 /apps/codecs/lib
parent59c995f58b52b1d41347ba4e81585423a29aa948 (diff)
downloadrockbox-f5ec0fa592f9e23625de38673d22c4c7ee0fdfad.zip
rockbox-f5ec0fa592f9e23625de38673d22c4c7ee0fdfad.tar.gz
rockbox-f5ec0fa592f9e23625de38673d22c4c7ee0fdfad.tar.bz2
rockbox-f5ec0fa592f9e23625de38673d22c4c7ee0fdfad.tar.xz
iriver: fix problem with playing some long vorbis files (e.g., this week in tech, #21); the decoder would run out of memory and freeze rockbox.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7526 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/lib')
-rw-r--r--apps/codecs/lib/codeclib.h6
-rw-r--r--apps/codecs/lib/xxx2wav.c2
-rw-r--r--apps/codecs/lib/xxx2wav.h6
3 files changed, 12 insertions, 2 deletions
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h
index 3fc03bd..d6bbfd3 100644
--- a/apps/codecs/lib/codeclib.h
+++ b/apps/codecs/lib/codeclib.h
@@ -28,9 +28,13 @@ extern unsigned char* mallocbuf; /* 512K from the start of MP3 buffer */
void* codec_malloc(size_t size);
void* codec_calloc(size_t nmemb, size_t size);
-void* codec_alloca(size_t size);
void* codec_realloc(void* ptr, size_t size);
void codec_free(void* ptr);
+
+#if defined(SIMULATOR)
+void* codec_alloca(size_t size);
+#endif
+
void *memcpy(void *dest, const void *src, size_t n);
void *memset(void *s, int c, size_t n);
int memcmp(const void *s1, const void *s2, size_t n);
diff --git a/apps/codecs/lib/xxx2wav.c b/apps/codecs/lib/xxx2wav.c
index cd09d32..776b29a 100644
--- a/apps/codecs/lib/xxx2wav.c
+++ b/apps/codecs/lib/xxx2wav.c
@@ -56,12 +56,14 @@ void* codec_calloc(size_t nmemb, size_t size)
return(x);
}
+#if defined(SIMULATOR)
void* codec_alloca(size_t size)
{
void* x;
x = codec_malloc(size);
return(x);
}
+#endif
void codec_free(void* ptr) {
(void)ptr;
diff --git a/apps/codecs/lib/xxx2wav.h b/apps/codecs/lib/xxx2wav.h
index 2c9a737..e1e7607 100644
--- a/apps/codecs/lib/xxx2wav.h
+++ b/apps/codecs/lib/xxx2wav.h
@@ -46,9 +46,13 @@ extern unsigned char* filebuf; // The rest of the MP3 buffer
void* codec_malloc(size_t size);
void* codec_calloc(size_t nmemb, size_t size);
-void* codec_alloca(size_t size);
void* codec_realloc(void* ptr, size_t size);
void codec_free(void* ptr);
+
+#if defined(SIMULATOR)
+void* codec_alloca(size_t size);
+#endif
+
size_t strlen(const char *s);
char *strcpy(char *dest, const char *src);
char *strcat(char *dest, const char *src);