X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=2f1fb787814742ed4d503612b0728d5d8158aaa4;hp=edd33c1db88e6add8f84677fce75bc0ff825334a;hb=a4f75cecaaee538edb7aae3f0ff19168a1dab59d;hpb=6668ac4a8c7f2a92efb9e6d405d954beff77d230

diff --git a/oggdec_filter.c b/oggdec_filter.c
index edd33c1d..2f1fb787 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -199,19 +199,15 @@ static void 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;
 	struct btr_node *btrn = fn->btrn;
-	size_t iqs, len;
-	int ret;
-	char *in;
+	int ret, ns;
 
 	pod->converted = 0;
 	t->error = 0;
-	ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
-	if (ret <= 0)
-		goto out;
-	btr_merge(btrn, fn->min_iqs);
-	len = btr_next_buffer(btrn, &in);
-	iqs = btr_get_input_queue_size(btrn);
+	ret = ns = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL);
 	if (!pod->vf) {
+		if (ret <= 0)
+			goto out;
+		btr_merge(btrn, fn->min_iqs);
 		ret = ogg_init(fn);
 		if (ret <= 0)
 			goto out;
@@ -224,15 +220,8 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t)
 		pod->converted = 0;
 		if (read_ret <= 0)
 			free(out);
-		if (read_ret == 0) {
-			if (btr_no_parent(btrn))
-				ret = -E_OGGDEC_EOF;
-			else
-				ret = 0;
-			goto out;
-		}
-		ret = 0;
-		if (read_ret == OV_HOLE)
+		ret = ns;
+		if (read_ret == 0 || read_ret == OV_HOLE)
 			goto out;
 		ret = -E_OGGDEC_BADLINK;
 		if (read_ret < 0)