X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec_filter.c;h=ac8148e863d8568082dca4cb3aac68843e5893a6;hp=9cea898035d77bea71c860a486e6bf609faeffbd;hb=5e8d8a8eea6de9459ebdf4498f9f061c84bfa63a;hpb=7c2c68b68140c775930d3c0e2cf7f1918539a465 diff --git a/aacdec_filter.c b/aacdec_filter.c index 9cea8980..ac8148e8 100644 --- a/aacdec_filter.c +++ b/aacdec_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2013 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -80,9 +80,9 @@ static void aacdec_close(struct filter_node *fn) fn->private_data = NULL; } -static int aacdec_post_select(__a_unused struct sched *s, struct task *t) +static int aacdec_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 btr_node *btrn = fn->btrn; struct private_aacdec_data *padd = fn->private_data; int i, ret; @@ -122,7 +122,7 @@ next_buffer: ret = -E_AACDEC_INIT; if (NeAACDecInit2(padd->handle, p, padd->decoder_length, &rate, - &channels) < 0) + &channels) != 0) goto out; } padd->sample_rate = rate; @@ -218,7 +218,6 @@ void aacdec_filter_init(struct filter *f) f->open = aacdec_open; f->close = aacdec_close; f->pre_select = generic_filter_pre_select; - f->new_post_select = aacdec_post_select; - f->post_select = NULL; + f->post_select = aacdec_post_select; f->execute = aacdec_execute; }