Warnings fixes, since MPD uses different mp4ff they
obviously changed some stuff around git-svn-id: https://svn.musicpd.org/mpd/trunk@4409 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
a150663e71
commit
099f0e103f
@ -53,11 +53,11 @@ static int mp4_getAACTrack(mp4ff_t *infile) {
|
|||||||
dummy7_8, dummy8_8;
|
dummy7_8, dummy8_8;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
mp4ff_get_decoder_config(infile, i, &buff, &buff_size);
|
mp4ff_get_decoder_config(infile, i, &buff, buff_size);
|
||||||
|
|
||||||
if (buff) {
|
if (buff) {
|
||||||
#ifdef HAVE_MP4AUDIOSPECIFICCONFIG
|
#ifdef HAVE_MP4AUDIOSPECIFICCONFIG
|
||||||
rc = AudioSpecificConfig(buff, buff_size, &mp4ASC);
|
rc = AudioSpecificConfig(buff, *buff_size, &mp4ASC);
|
||||||
#else
|
#else
|
||||||
rc = AudioSpecificConfig(buff, &dummy1_32, &dummy2_8,
|
rc = AudioSpecificConfig(buff, &dummy1_32, &dummy2_8,
|
||||||
&dummy3_8, &dummy4_8, &dummy5_8,
|
&dummy3_8, &dummy4_8, &dummy5_8,
|
||||||
@ -109,8 +109,8 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char * path) {
|
|||||||
faacDecHandle * decoder;
|
faacDecHandle * decoder;
|
||||||
faacDecFrameInfo frameInfo;
|
faacDecFrameInfo frameInfo;
|
||||||
unsigned char * mp4Buffer;
|
unsigned char * mp4Buffer;
|
||||||
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