X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=7c25a74a4358cd76bfcaf88e8a1d8d7e502a75b8;hp=214ceb1b2851cab7a368d4b2001ad976d958644f;hb=01b40fb41cbfaa2d5f053b9985daedc8b7184fdd;hpb=74a835c7c3b6f4f71fc1f4739f26757dffdf012a diff --git a/wmadec_filter.c b/wmadec_filter.c index 214ceb1b..7c25a74a 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -1230,19 +1230,21 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result) static void wmadec_post_select(__a_unused struct sched *s, struct task *t) { struct filter_node *fn = container_of(t, struct filter_node, task); - int ret, converted = 0; + int ret, converted; struct private_wmadec_data *pwd = fn->private_data; struct btr_node *btrn = fn->btrn; size_t len; char *in; next_buffer: + converted = 0; t->error = 0; - ret = prepare_filter_node(fn); + ret = btr_node_status(btrn, fn->min_iqs); if (ret < 0) goto err; if (ret == 0) return; + btr_merge(btrn, fn->min_iqs); len = btr_next_buffer(btrn, (char **)&in); ret = -E_WMADEC_EOF; if (len < fn->min_iqs) @@ -1281,9 +1283,8 @@ success: goto next_buffer; err: assert(ret < 0); - wmadec_close(fn); t->error = ret; - btr_del_node(btrn); + btr_remove_node(btrn); } static ssize_t wmadec_convert(char *inbuffer, size_t len,