X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=1eaa79300f5f70a9310ca17d7c52e5ba38e76a5b;hp=b405f869ebf4e9af697a87b0fd4a1736e44098ce;hb=d2c65fd068a5c2e7cde52bd06e1eadc7e7e37364;hpb=f652ce6afe7f6fd0e42814505234cbf4321a736e diff --git a/oggdec_filter.c b/oggdec_filter.c index b405f869..1eaa7930 100644 --- a/oggdec_filter.c +++ b/oggdec_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2013 Andre Noll + * Copyright (C) 2005-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -199,7 +199,7 @@ static void ogg_pre_select(struct sched *s, struct task *t) sched_min_delay(s); } -static void ogg_post_select(__a_unused struct sched *s, struct task *t) +static int ogg_post_select(__a_unused struct sched *s, struct task *t) { struct filter_node *fn = container_of(t, struct filter_node, task); struct private_oggdec_data *pod = fn->private_data; @@ -217,7 +217,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t) } else if (ret == 0 && !pod->have_more) /* nothing to do */ goto out; if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE) - return; + return 0; if (!pod->vf) { if (ret <= 0) goto out; @@ -254,12 +254,12 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t) if (ret == OV_HOLE) /* avoid buffer underruns */ fn->min_iqs = 9000; if (ret >= 0 || ret == OV_HOLE) - return; + return 0; ret = -E_OGGDEC_BADLINK; out: - t->error = ret; if (ret < 0) btr_remove_node(&fn->btrn); + return ret; } /**