diff options
| author | Max Kellermann <max@duempel.org> | 2008-04-12 04:15:10 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-04-12 04:15:10 +0000 |
| commit | a5aa5a0258fa7cf961536df46375b8f0b1d7b84e (patch) | |
| tree | 0ede25948e57040b9a3d84635b0e0068f146882d /src/inputPlugins | |
| parent | 4e0891337ad12435e248ead9d2eec4d4d20cd74b (diff) | |
| download | mpd-a5aa5a0258fa7cf961536df46375b8f0b1d7b84e.tar.gz mpd-a5aa5a0258fa7cf961536df46375b8f0b1d7b84e.tar.xz mpd-a5aa5a0258fa7cf961536df46375b8f0b1d7b84e.zip | |
yet more unsigned integers
git-svn-id: https://svn.musicpd.org/mpd/trunk@7287 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/inputPlugins')
| -rw-r--r-- | src/inputPlugins/mp3_plugin.c | 8 | ||||
| -rw-r--r-- | src/inputPlugins/mp4_plugin.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c index f6b45cd2f..875ec1482 100644 --- a/src/inputPlugins/mp3_plugin.c +++ b/src/inputPlugins/mp3_plugin.c @@ -285,7 +285,7 @@ static ReplayGainInfo *parseId3ReplayGainInfo(struct id3_tag *tag) #endif #ifdef HAVE_ID3TAG -static void mp3_parseId3Tag(mp3DecodeData * data, signed long tagsize, +static void mp3_parseId3Tag(mp3DecodeData * data, size_t tagsize, MpdTag ** mpdTag, ReplayGainInfo ** replayGainInfo) { struct id3_tag *id3Tag = NULL; @@ -309,7 +309,7 @@ static void mp3_parseId3Tag(mp3DecodeData * data, signed long tagsize, mad_stream_skip(&(data->stream), count); while (count < tagsize) { - int len; + size_t len; len = readFromInputStream(data->inStream, allocated + count, (size_t) 1, @@ -383,8 +383,8 @@ static int decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag, if (tagsize > 0) { if (tag && !(*tag)) { - mp3_parseId3Tag(data, tagsize, tag, - replayGainInfo); + mp3_parseId3Tag(data, (size_t)tagsize, + tag, replayGainInfo); } else { mad_stream_skip(&(data->stream), tagsize); diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c index 0484e9993..c4a04f582 100644 --- a/src/inputPlugins/mp4_plugin.c +++ b/src/inputPlugins/mp4_plugin.c @@ -260,7 +260,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, dc->state = DECODE_STATE_DECODE; } - if (channels * (dur + offset) > frameInfo.samples) { + if (channels * (unsigned long)(dur + offset) > frameInfo.samples) { dur = frameInfo.samples / channels; offset = 0; } |