X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=aacdec_filter.c;h=b40022fe160e21d254eff7ab7672826258b68a0b;hb=f6a845d497ed6883e8318acc8a17d2ed07b85a51;hp=9cea898035d77bea71c860a486e6bf609faeffbd;hpb=7c2c68b68140c775930d3c0e2cf7f1918539a465;p=paraslash.git

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 9cea8980..b40022fe 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * 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,12 +122,12 @@ 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;
 		padd->channels = channels;
-		PARA_INFO_LOG("rate: %u, channels: %d\n",
+		PARA_INFO_LOG("rate: %u, channels: %u\n",
 			padd->sample_rate, padd->channels);
 		padd->initialized = 1;
 	}
@@ -171,7 +171,7 @@ next_buffer:
 			goto success;
 		}
 		PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(err));
-		PARA_ERROR_LOG("consumed: %zu + %zd + %lu\n",
+		PARA_ERROR_LOG("consumed: %zu + %zu + %lu\n",
 			padd->consumed_total, consumed,
 			padd->frame_info.bytesconsumed);
 		if (consumed < len)
@@ -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;
 }