From: Andre Noll <maan@systemlinux.org>
Date: Sat, 28 Feb 2009 13:56:11 +0000 (+0100)
Subject: Merge branch 'gerrit'
X-Git-Tag: v0.3.4~57^2~16
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=7565af270650435630bf212592286a8c6555d749;hp=625c5cd993d07a63061a0788f174e12fa1c221e0

Merge branch 'gerrit'
---

diff --git a/aacdec_filter.c b/aacdec_filter.c
index d9226b0d..1ceca1fc 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -62,7 +62,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) {