X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec_filter.c;h=ae3a90e6c908391869ed551d5443f8e570089306;hp=8eddc0e71566d7c9cb816a5d52d70e5d35bb5b84;hb=1e012cf40238883621692051a22fb9c7cad5e944;hpb=40de1dd2fdbb054444d585aa70e2d50166a66e07

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 8eddc0e7..ae3a90e6 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -10,11 +10,14 @@
 
 /** \file aacdec_filter.c paraslash's aac (m4a) decoder. */
 
-#include "para.h"
+#include <regex.h>
+#include <stdbool.h>
 
+#include "para.h"
 #include "list.h"
 #include "sched.h"
 #include "ggo.h"
+#include "buffer_tree.h"
 #include "filter.h"
 #include "error.h"
 #include "string.h"
@@ -62,7 +65,10 @@ 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_error)
+	ret = *fc->input_error;
+	if (ret < 0)
+		return ret;
+	if (len < 2048)
 		return 0;
 
 	if (!padd->initialized) {