aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvuton Olrich <avuton@gmail.com>2006-07-19 20:11:14 +0000
committerAvuton Olrich <avuton@gmail.com>2006-07-19 20:11:14 +0000
commit099f0e103f7591eef81183292d704b3a77a99018 (patch)
tree28a78c444b06d4862c117f89643f40bfb87c476d
parenta150663e713395ab0ff0ea71c54ee77bee6b499c (diff)
downloadmpd-099f0e103f7591eef81183292d704b3a77a99018.tar.gz
mpd-099f0e103f7591eef81183292d704b3a77a99018.tar.xz
mpd-099f0e103f7591eef81183292d704b3a77a99018.zip
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
-rw-r--r--src/inputPlugins/mp4_plugin.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c
index af0b53720..4c24eb15d 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -53,11 +53,11 @@ static int mp4_getAACTrack(mp4ff_t *infile) {
dummy7_8, dummy8_8;
#endif
- mp4ff_get_decoder_config(infile, i, &buff, &buff_size);
+ mp4ff_get_decoder_config(infile, i, &buff, buff_size);
if (buff) {
#ifdef HAVE_MP4AUDIOSPECIFICCONFIG
- rc = AudioSpecificConfig(buff, buff_size, &mp4ASC);
+ rc = AudioSpecificConfig(buff, *buff_size, &mp4ASC);
#else
rc = AudioSpecificConfig(buff, &dummy1_32, &dummy2_8,
&dummy3_8, &dummy4_8, &dummy5_8,
@@ -109,8 +109,8 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char * path) {
faacDecHandle * decoder;
faacDecFrameInfo frameInfo;
unsigned char * mp4Buffer;
- int mp4BufferSize;
- unsigned long sampleRate;
+ unsigned int mp4BufferSize;
+ uint32_t sampleRate;
unsigned char channels;
long sampleId;
long numSamples;