The mp4 tagger.

[paraslash.git] / spxdec_filter.c

diff --git a/spxdec_filter.c b/spxdec_filter.c
index da2d5da6961578f30decd2a80a40d6e677bc79ba..cf1fe604436b69bff0dd81b81000cfe67058de23 100644 (file)
--- a/spxdec_filter.c
+++ b/spxdec_filter.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2002-2006 Jean-Marc Valin
- * Copyright (C) 2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2010 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -43,7 +43,6 @@
 #include <regex.h>
 #include <ogg/ogg.h>
 #include <speex/speex.h>
-#include <stdbool.h>
 #include <speex/speex_header.h>
 #include <speex/speex_stereo.h>
 #include <speex/speex_callbacks.h>
@@ -239,9 +238,9 @@ 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, void *context)
 {
-       struct filter_node *fn = container_of(t, struct filter_node, task);
+       struct filter_node *fn = context;
        struct private_spxdec_data *psd = fn->private_data;
        struct btr_node *btrn = fn->btrn;
        int ret, ns;
@@ -250,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) {
@@ -291,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;
 }
 
 /**