Mercurial > audlegacy-plugins
changeset 686:0d098b87207a trunk
[svn] - remove some pointless bloat
| author | nenolod |
|---|---|
| date | Tue, 20 Feb 2007 05:51:43 -0800 |
| parents | 46743e3ebcc1 |
| children | 6dd733e046fa |
| files | ChangeLog src/aac/src/libmp4.c |
| diffstat | 2 files changed, 15 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Feb 20 05:51:23 2007 -0800 +++ b/ChangeLog Tue Feb 20 05:51:43 2007 -0800 @@ -1,3 +1,10 @@ +2007-02-20 13:51:23 +0000 Jonathan Schleifer <js@h3c.de> + revision [1456] + Use g_convert instead of str_to_utf8. This fixes ID3-Tags with ISO8859-1 encoded umlauts. + trunk/src/madplug/input.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2007-02-20 13:47:25 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [1454] - aacplus shoutcast support. prepare for segfaults.
--- a/src/aac/src/libmp4.c Tue Feb 20 05:51:23 2007 -0800 +++ b/src/aac/src/libmp4.c Tue Feb 20 05:51:43 2007 -0800 @@ -668,11 +668,6 @@ g_static_mutex_unlock(&mutex); g_thread_exit(NULL); } -#if 0 - config = faacDecGetCurrentConfiguration(decoder); - config->useOldADTSFormat = 0; - faacDecSetConfiguration(decoder, config); -#endif if((buffer = g_malloc(BUFFER_SIZE)) == NULL){ g_print("AAC: error g_malloc\n"); vfs_fclose(file); @@ -745,33 +740,15 @@ } sample_buffer = faacDecDecode(decoder, &finfo, buffer, buffervalid); if(finfo.error > 0){ - config = faacDecGetCurrentConfiguration(decoder); - if(config->useOldADTSFormat != 1){ - faacDecClose(decoder); - decoder = faacDecOpen(); - config = faacDecGetCurrentConfiguration(decoder); - config->useOldADTSFormat = 1; - faacDecSetConfiguration(decoder, config); - finfo.bytesconsumed=0; - finfo.samples = 0; - faacDecInit(decoder, - buffer, - buffervalid, - &samplerate, - &channels); + buffervalid--; + memmove(buffer, &buffer[1], buffervalid); + bufferconsumed = aac_probe(buffer, buffervalid); + if(bufferconsumed) { + memmove(buffer, &buffer[bufferconsumed], buffervalid-bufferconsumed); + buffervalid -= bufferconsumed; + bufferconsumed = 0; } - else - { - buffervalid--; - memmove(buffer, &buffer[1], buffervalid); - bufferconsumed = aac_probe(buffer, buffervalid); - if(bufferconsumed) { - memmove(buffer, &buffer[bufferconsumed], buffervalid-bufferconsumed); - buffervalid -= bufferconsumed; - bufferconsumed = 0; - } - continue; - } + continue; } bufferconsumed += finfo.bytesconsumed; samplesdecoded = finfo.samples;