devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Comment unused code in libmad. Clean up initialization and memset'ing of decoder arrays.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27159 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-06-27 18:11:07 +00:00
parent 9e86287946
commit 4c026f0c7f
7 changed files with 47 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/codecs/libmad/layer3.c
View file

@ -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) ?