diff options
author | Max Kellermann <max@duempel.org> | 2008-08-26 08:27:10 +0200 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2008-08-30 18:44:41 -0700 |
commit | 5cabe3399b7e1b47ad62b57815987742b424c5dc (patch) | |
tree | 517e2c79918ed4a4346c54c87c6b60df9957f86f | |
parent | 43fc7747130702b7a2a02547f90bbcbddf42d32d (diff) | |
download | mpd-5cabe3399b7e1b47ad62b57815987742b424c5dc.tar.gz mpd-5cabe3399b7e1b47ad62b57815987742b424c5dc.tar.xz mpd-5cabe3399b7e1b47ad62b57815987742b424c5dc.zip |
eliminate unused variables in the AAC decoder
-rw-r--r-- | src/inputPlugins/aac_plugin.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c index 7cff31d40..400b43f28 100644 --- a/src/inputPlugins/aac_plugin.c +++ b/src/inputPlugins/aac_plugin.c @@ -93,9 +93,8 @@ static int adtsSampleRates[] = static int adtsParse(AacBuffer * b, float *length) { int frames, frameLength; - int tFrameLength = 0; int sampleRate = 0; - float framesPerSec, bytesPerFrame; + float framesPerSec; /* Read all frames to ensure correct time and bitrate */ for (frames = 0;; frames++) { @@ -118,8 +117,6 @@ static int adtsParse(AacBuffer * b, float *length) << 11) | (((unsigned int)b->buffer[4]) << 3) | (b->buffer[5] >> 5); - tFrameLength += frameLength; - if (frameLength > b->bytesIntoBuffer) break; @@ -129,10 +126,6 @@ static int adtsParse(AacBuffer * b, float *length) } framesPerSec = (float)sampleRate / 1024.0; - if (frames != 0) { - bytesPerFrame = (float)tFrameLength / (float)(frames * 1000); - } else - bytesPerFrame = 0; if (framesPerSec != 0) *length = (float)frames / framesPerSec; @@ -227,7 +220,6 @@ static float getAacFloatTotalTime(char *file) { AacBuffer b; float length; - size_t fileread, tagsize; faacDecHandle decoder; faacDecConfigurationPtr config; uint32_t sampleRate; @@ -238,7 +230,7 @@ static float getAacFloatTotalTime(char *file) if (openInputStream(&inStream, file) < 0) return -1; - initAacBuffer(&inStream, &b, &length, &fileread, &tagsize); + initAacBuffer(&inStream, &b, &length, NULL, NULL); if (length < 0) { decoder = faacDecOpen(); |