X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wmadec_filter.c;h=8b751f04592eff0f7d6b3e5fe73ade1938c17382;hp=20f9df44b92b35061980d857f86c9ccee40b4bcd;hb=7532dc26edc72f4ec98acd0a62e1b02994c34171;hpb=b66dfd41e268e64b65d2990bdec3d3a7e119e234 diff --git a/wmadec_filter.c b/wmadec_filter.c index 20f9df44..8b751f04 100644 --- a/wmadec_filter.c +++ b/wmadec_filter.c @@ -17,7 +17,6 @@ #define _XOPEN_SOURCE 600 -#include #include #include #include @@ -1211,7 +1210,7 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result) #define WMA_OUTPUT_BUFFER_SIZE (128 * 1024) -static void wmadec_post_select(__a_unused struct sched *s, struct task *t) +static int 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, out_size; @@ -1222,12 +1221,11 @@ static void wmadec_post_select(__a_unused struct sched *s, struct task *t) next_buffer: converted = 0; - t->error = 0; ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL); if (ret < 0) goto err; if (ret == 0) - return; + return 0; btr_merge(btrn, fn->min_iqs); len = btr_next_buffer(btrn, (char **)&in); ret = -E_WMADEC_EOF; @@ -1263,11 +1261,11 @@ next_buffer: converted += ret + WMA_FRAME_SKIP; success: btr_consume(btrn, converted); - return; + return 0; err: assert(ret < 0); - t->error = ret; btr_remove_node(&fn->btrn); + return ret; } static void wmadec_open(struct filter_node *fn)