X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=spxdec_filter.c;h=cf1fe604436b69bff0dd81b81000cfe67058de23;hp=6bd4114666492f1a6fea62e0fd1da2b9a3380ed4;hb=9aa1f3d69c0aa335b3026581defbc09eb2c4efb4;hpb=3879481ddabc38236b9eee979a090c2a9bfa74d3 diff --git a/spxdec_filter.c b/spxdec_filter.c index 6bd41146..cf1fe604 100644 --- a/spxdec_filter.c +++ b/spxdec_filter.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2002-2006 Jean-Marc Valin - * Copyright (C) 2010-2013 Andre Noll + * Copyright (C) 2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -238,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; @@ -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; + if (ret < 0) btr_remove_node(&fn->btrn); - } + return ret; } /**