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

diff --git a/aacdec_filter.c b/aacdec_filter.c
index d63236da..b40022fe 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 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;
@@ -127,7 +127,7 @@ next_buffer:
 		}
 		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)