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
This commit is contained in:
parent
2ede0780f6
commit
05c41a80ed
@ -234,7 +234,7 @@ static float getAacFloatTotalTime(char *file)
|
|||||||
size_t fileread, tagsize;
|
size_t fileread, tagsize;
|
||||||
faacDecHandle decoder;
|
faacDecHandle decoder;
|
||||||
faacDecConfigurationPtr config;
|
faacDecConfigurationPtr config;
|
||||||
unsigned long sampleRate;
|
uint32_t sampleRate;
|
||||||
unsigned char channels;
|
unsigned char channels;
|
||||||
InputStream inStream;
|
InputStream inStream;
|
||||||
long bread;
|
long bread;
|
||||||
@ -290,7 +290,7 @@ static int aac_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
|
|||||||
faacDecFrameInfo frameInfo;
|
faacDecFrameInfo frameInfo;
|
||||||
faacDecConfigurationPtr config;
|
faacDecConfigurationPtr config;
|
||||||
long bread;
|
long bread;
|
||||||
unsigned long sampleRate;
|
uint32_t sampleRate;
|
||||||
unsigned char channels;
|
unsigned char channels;
|
||||||
int eof = 0;
|
int eof = 0;
|
||||||
unsigned int sampleCount;
|
unsigned int sampleCount;
|
||||||
|
@ -97,7 +97,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc,
|
|||||||
faacDecConfigurationPtr config;
|
faacDecConfigurationPtr config;
|
||||||
unsigned char *mp4Buffer;
|
unsigned char *mp4Buffer;
|
||||||
unsigned int mp4BufferSize;
|
unsigned int mp4BufferSize;
|
||||||
unsigned long sampleRate;
|
uint32_t sampleRate;
|
||||||
unsigned char channels;
|
unsigned char channels;
|
||||||
long sampleId;
|
long sampleId;
|
||||||
long numSamples;
|
long numSamples;
|
||||||
|
Loading…
Reference in New Issue
Block a user