diff options
| author | Max Kellermann <max@duempel.org> | 2008-04-12 04:15:24 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-04-12 04:15:24 +0000 |
| commit | 05c41a80ed4c62ea66bdf5aa95d1b5b0fdc79d30 (patch) | |
| tree | 784b79fce719227eb02b2fe6901c4601a8ef2549 | |
| parent | 2ede0780f66ce0064c625e4611b29e2400467303 (diff) | |
| download | mpd-05c41a80ed4c62ea66bdf5aa95d1b5b0fdc79d30.tar.gz mpd-05c41a80ed4c62ea66bdf5aa95d1b5b0fdc79d30.tar.xz mpd-05c41a80ed4c62ea66bdf5aa95d1b5b0fdc79d30.zip | |
fix parameter types in the faad calls
libfaad wants uint32_t pointers. Passing a long pointer is bugged on
amd64.
git-svn-id: https://svn.musicpd.org/mpd/trunk@7289 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | src/inputPlugins/aac_plugin.c | 4 | ||||
| -rw-r--r-- | src/inputPlugins/mp4_plugin.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c index de442acf7..7fa1ba332 100644 --- a/src/inputPlugins/aac_plugin.c +++ b/src/inputPlugins/aac_plugin.c @@ -234,7 +234,7 @@ static float getAacFloatTotalTime(char *file) size_t fileread, tagsize; faacDecHandle decoder; faacDecConfigurationPtr config; - unsigned long sampleRate; + uint32_t sampleRate; unsigned char channels; InputStream inStream; long bread; @@ -290,7 +290,7 @@ static int aac_decode(OutputBuffer * cb, DecoderControl * dc, char *path) faacDecFrameInfo frameInfo; faacDecConfigurationPtr config; long bread; - unsigned long sampleRate; + uint32_t sampleRate; unsigned char channels; int eof = 0; unsigned int sampleCount; diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c index c4a04f582..adaa644b9 100644 --- a/src/inputPlugins/mp4_plugin.c +++ b/src/inputPlugins/mp4_plugin.c @@ -97,7 +97,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, faacDecConfigurationPtr config; unsigned char *mp4Buffer; unsigned int mp4BufferSize; - unsigned long sampleRate; + uint32_t sampleRate; unsigned char channels; long sampleId; long numSamples; |