X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=spxdec_filter.c;h=9bba042c040c0687eb33f0fc156dbf62f06392c9;hp=e54b2657d02650bdd33e22b730ee7c0a71f051eb;hb=081c8921f827c1ed482c45ba22bd8bb97db2838b;hpb=1cefe6a503c74d609db4e99e689d46575a5e40fd

diff --git a/spxdec_filter.c b/spxdec_filter.c
index e54b2657..9bba042c 100644
--- a/spxdec_filter.c
+++ b/spxdec_filter.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2002-2006 Jean-Marc Valin
- * Copyright (C) 2010-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2010-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -238,7 +238,7 @@ static int compute_skip_samples(ogg_page *og, struct private_spxdec_data *psd)
 	return ret;
 }
 
-static void speexdec_post_select(__a_unused struct sched *s, struct task *t)
+static int speexdec_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct private_spxdec_data *psd = fn->private_data;
@@ -249,7 +249,6 @@ static void speexdec_post_select(__a_unused struct sched *s, struct task *t)
 	size_t nbytes;
 
 next_buffer:
-	t->error = 0;
 	ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	btr_merge(btrn, fn->min_iqs);
 	if (!psd->shi.state) {
@@ -290,10 +289,9 @@ next_buffer:
 		goto next_buffer;
 	ret = ns;
 fail:
-	if (ret < 0) {
-		t->error = ret;
-		btr_remove_node(btrn);
-	}
+	if (ret < 0)
+		btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 /**