aboutsummaryrefslogtreecommitdiffstats
path: root/src/inputPlugins
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2006-10-18 02:49:13 +0000
committerWarren Dukes <warren.dukes@gmail.com>2006-10-18 02:49:13 +0000
commit29c7681ca4746fc663dc070f09102eb184f94044 (patch)
treec75f567e34c7408d29b3206dfc61b971d5700d90 /src/inputPlugins
parente9f51778ef4784ae42ff8d13b7d0f3ccfc49bead (diff)
downloadmpd-29c7681ca4746fc663dc070f09102eb184f94044.tar.gz
mpd-29c7681ca4746fc663dc070f09102eb184f94044.tar.xz
mpd-29c7681ca4746fc663dc070f09102eb184f94044.zip
jack patch from anarch (and some type fixes for mp4 and acc plugins)
git-svn-id: https://svn.musicpd.org/mpd/trunk@4912 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/inputPlugins')
-rw-r--r--src/inputPlugins/aac_plugin.c4
-rw-r--r--src/inputPlugins/mp4_plugin.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c
index 07906152c..04000e746 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/inputPlugins/aac_plugin.c
@@ -237,7 +237,7 @@ static float getAacFloatTotalTime(char *file)
size_t fileread, tagsize;
faacDecHandle decoder;
faacDecConfigurationPtr config;
- unsigned int sampleRate;
+ unsigned long sampleRate;
unsigned char channels;
InputStream inStream;
long bread;
@@ -293,7 +293,7 @@ static int aac_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
faacDecFrameInfo frameInfo;
faacDecConfigurationPtr config;
long bread;
- unsigned int sampleRate;
+ unsigned long 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 6c659cbb6..b3439056d 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -100,7 +100,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
faacDecConfigurationPtr config;
unsigned char *mp4Buffer;
unsigned int mp4BufferSize;
- uint32_t sampleRate;
+ unsigned long sampleRate;
unsigned char channels;
long sampleId;
long numSamples;