X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=opusdec_filter.c;h=292d83c9f960ce1332e029c4addd231a8e7f7cb1;hp=c3b405cc338df6666342e863aa3a0ac053ea8500;hb=80ff4e0205b6eefa603835fdc30f7f32fbd21f9f;hpb=e6e3a404091110ac770f65dad64e194f5900cd27

diff --git a/opusdec_filter.c b/opusdec_filter.c
index c3b405cc..292d83c9 100644
--- a/opusdec_filter.c
+++ b/opusdec_filter.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2002-2007 Jean-Marc Valin
  * Copyright (c) 2008 CSIRO
  * Copyright (c) 2007-2012 Xiph.Org Foundation
- * Copyright (C) 2012-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2012-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -209,7 +209,7 @@ static int decode_packet(struct opusdec_context *ctx, ogg_packet *op,
 
 static int opusdec_post_select(__a_unused struct sched *s, struct task *t)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = task_context(t);
 	struct opusdec_context *ctx = fn->private_data;
 	struct btr_node *btrn = fn->btrn;
 	int ret;
@@ -271,13 +271,13 @@ out:
 
 static void opusdec_pre_select(struct sched *s, struct task *t)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = task_context(t);
 	struct opusdec_context *ctx = fn->private_data;
 	int ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
 
 	if (ret != 0)
 		return sched_min_delay(s);
-	if (ctx->have_more)
+	if (!ctx->have_more)
 		return;
 	if (btr_get_output_queue_size(fn->btrn) <= OPUSDEC_MAX_OUTPUT_SIZE)
 		return sched_min_delay(s);