introduce struct writer and struct writer_node

[paraslash.git] / mp3dec.c

diff --git a/mp3dec.c b/mp3dec.c
index 0100d04ea7d8a191a57c7264972870756d53ded4..764fc2665efee91301611b1a0f903f3ac1bd8090 100644 (file)
--- a/mp3dec.c
+++ b/mp3dec.c
@@ -18,7 +18,6 @@
 
 /** \file mp3dec.c paraslash's mp3 decoder */
 
-#include "gcc-compat.h"
 #include "para.h"
 
 #include "list.h"
@@ -53,7 +52,7 @@ static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 {
        int i, ret;
        struct private_mp3dec_data *pmd = fn->private_data;
-       size_t copy = MIN(len, 4096);
+       size_t copy = PARA_MIN(len, 4096);
 
        if (fn->loaded > fn->bufsize * 4 / 5)
                return 0;
@@ -64,7 +63,7 @@ next_frame:
        if (ret) {
                if (MAD_RECOVERABLE(pmd->stream.error) || pmd->stream.error == MAD_ERROR_BUFLEN)
                        goto out;
-               PARA_ERROR_LOG("fatal: ret = %d, loaded = %d\n", ret, fn->loaded);
+               PARA_ERROR_LOG("fatal: ret = %d, loaded = %zd\n", ret, fn->loaded);
                return -E_MAD_FRAME_DECODE;
        }
        mad_synth_frame(&pmd->synth, &pmd->frame);
@@ -83,7 +82,7 @@ next_frame:
                }
                if (fn->loaded != fn->bufsize) /* output buffer not full */
                        continue;
-               PARA_ERROR_LOG("output buffer full: %d\n", fn->loaded);
+               PARA_ERROR_LOG("output buffer full: %zd\n", fn->loaded);
                        return -E_MP3DEC_OVERRUN;
        }
        if (fn->loaded <= fn->bufsize * 4 / 5)
@@ -91,7 +90,7 @@ next_frame:
 out:
        if (pmd->stream.next_frame) { /* we still have some data */
                size_t off = pmd->stream.bufend - pmd->stream.next_frame;
-               PARA_DEBUG_LOG("converted %d, %d input bytes, %d output bytes\n",
+               PARA_DEBUG_LOG("converted %zd, %zd input bytes, %zd output bytes\n",
                        len - off, off, fn->loaded);
                return copy - off;
        }