X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=f41150f2638c62d4dd48fc23f9705f1dcf94ac4d;hp=9498313c6ca42cb1cbe2c3e792b88f8f381d1d14;hb=484e75562df55dca31ffcb9e5b05a490b4a3d3a1;hpb=2ce04a49091712719b8fd60a6c7888258b719db1

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 9498313c..f41150f2 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -199,7 +199,7 @@ static void ogg_pre_select(struct sched *s, struct task *t)
 	sched_min_delay(s);
 }
 
-static void ogg_post_select(__a_unused struct sched *s, struct task *t)
+static int ogg_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	struct private_oggdec_data *pod = fn->private_data;
@@ -217,7 +217,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 	} else if (ret == 0 && !pod->have_more) /* nothing to do */
 		goto out;
 	if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
-		return;
+		return 0;
 	if (!pod->vf) {
 		if (ret <= 0)
 			goto out;
@@ -254,12 +254,12 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 	if (ret == OV_HOLE) /* avoid buffer underruns */
 		fn->min_iqs = 9000;
 	if (ret >= 0 || ret == OV_HOLE)
-		return;
+		return 0;
 	ret = -E_OGGDEC_BADLINK;
 out:
-	t->error = ret;
 	if (ret < 0)
-		btr_remove_node(btrn);
+		btr_remove_node(&fn->btrn);
+	return ret;
 }
 
 /**