Merge commit 'fml/master'

diff --cc mp3dec_filter.c
index e9d84c1baf366ef4390082bca5e8f27c289e7008,5e5df865b50b17373c404a0fe494373b607dbde2..aa2ab510240e448c410dddc90fb445e471859445
--- 1/mp3dec_filter.c
--- 2/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;