diff options
| author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-06-27 18:11:07 +0000 |
|---|---|---|
| committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2010-06-27 18:11:07 +0000 |
| commit | 4c026f0c7f5ca6d02bf010fabe5123b9b39ddf47 (patch) | |
| tree | 18c1d4ae3392fb904dd981d0bcd110a46a1bbd35 /apps/codecs/libmad/layer3.c | |
| parent | 9e86287946517e06893f4950d45d60056c00d9e7 (diff) | |
| download | rockbox-4c026f0c7f5ca6d02bf010fabe5123b9b39ddf47.zip rockbox-4c026f0c7f5ca6d02bf010fabe5123b9b39ddf47.tar.gz rockbox-4c026f0c7f5ca6d02bf010fabe5123b9b39ddf47.tar.bz2 rockbox-4c026f0c7f5ca6d02bf010fabe5123b9b39ddf47.tar.xz | |
Comment unused code in libmad. Clean up initialization and memset'ing of decoder arrays.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27159 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libmad/layer3.c')
| -rw-r--r-- | apps/codecs/libmad/layer3.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/apps/codecs/libmad/layer3.c b/apps/codecs/libmad/layer3.c index 752dbdb..0198e66 100644 --- a/apps/codecs/libmad/layer3.c +++ b/apps/codecs/libmad/layer3.c @@ -3230,8 +3230,10 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame) enum mad_error error; int result = 0; +#if 0 /* rockbox: do not allocate */ /* allocate Layer III dynamic structures */ - + /* rockbox: not used. Both pointers are linked to an array in rockbox' + * apps/codecs/mpa.c before calling this. */ if (stream->main_data == 0) { stream->main_data = malloc(MAD_BUFFER_MDLEN); if (stream->main_data == 0) { @@ -3247,6 +3249,13 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame) return -1; } } +#else + /* rockbox: This should not happen. Return with error. */ + if ((stream->main_data == 0) || (frame->overlap == 0)) { + stream->error = MAD_ERROR_NOMEM; + return -1; + } +#endif /* rockbox */ nch = MAD_NCHANNELS(header); si_len = (header->flags & MAD_FLAG_LSF_EXT) ? |