From: Andre Noll <maan@systemlinux.org>
Date: Mon, 1 Dec 2008 20:19:17 +0000 (+0100)
Subject: Merge commit 'fml/master'
X-Git-Tag: v0.3.4~91
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=e9805263600a69a88e60edd1c8b4ba9e01a79322;p=paraslash.git

Merge commit 'fml/master'
---

e9805263600a69a88e60edd1c8b4ba9e01a79322
diff --cc mp3dec_filter.c
index e9d84c1b,5e5df865..aa2ab510
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@@ -33,9 -35,9 +33,9 @@@ static ssize_t mp3dec(char *inbuffer, s
  {
  	int i, ret;
  	struct private_mp3dec_data *pmd = fn->private_data;
- 	size_t copy = PARA_MIN(len, 4096);
+ 	size_t copy = PARA_MIN(len, (size_t)4096);
  
 -	if (fn->loaded > fn->bufsize * 4 / 5)
 +	if (fn->loaded + 16384 > fn->bufsize)
  		return 0;
  	mad_stream_buffer(&pmd->stream, (unsigned char *) inbuffer, copy);
  	pmd->stream.error = 0;