Fix -Wdeclaration-after-statement warnings.

[paraslash.git] / aacdec.c

diff --git a/aacdec.c b/aacdec.c
index 2f2a1ad4bcb9ddf722bf72934f94d518e56206a6..4c256946cca74ab5719b4b245cb886940ba4eea0 100644 (file)
--- a/aacdec.c
+++ b/aacdec.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -61,7 +61,7 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 
        if (fn->loaded > fn->bufsize * 3 / 5)
                return 0;
-       if (len < 2048 && !*fc->input_eof)
+       if (len < 2048 && !*fc->input_error)
                return 0;
 
        if (!padd->initialized) {
@@ -69,7 +69,7 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
                unsigned char channels = 0;
                ret = aac_find_esds(inbuf, len, &skip, &padd->decoder_length);
                if (ret < 0) {
-                       PARA_INFO_LOG("%s\n", PARA_STRERROR(-ret));
+                       PARA_INFO_LOG("%s\n", para_strerror(-ret));
                        ret = NeAACDecInit(padd->handle, inbuf,
                                len, &rate, &channels);
                        PARA_INFO_LOG("decoder init: %d\n", ret);
@@ -157,9 +157,9 @@ out:
 
 static void aacdec_open(struct filter_node *fn)
 {
-       fn->private_data = para_calloc(sizeof(struct private_aacdec_data));
-       struct private_aacdec_data *padd = fn->private_data;
+       struct private_aacdec_data *padd = para_calloc(sizeof(*padd));
 
+       fn->private_data = padd;
        fn->bufsize = AAC_OUTBUF_SIZE;
        fn->buf = para_calloc(fn->bufsize);
        padd->handle = aac_open();