X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=b405f869ebf4e9af697a87b0fd4a1736e44098ce;hp=16c8d907f01fab92fa6c1c74435920448da5349f;hb=e3868dab3db27242f066bf52d95d0b3f2c0df7e3;hpb=c7e2f73900021e5b3f655c91a7cc0fdda76bd0ec diff --git a/oggdec_filter.c b/oggdec_filter.c index 16c8d907..b405f869 100644 --- a/oggdec_filter.c +++ b/oggdec_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2012 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -208,9 +208,13 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t) char *buf; ret = btr_node_status(btrn, fn->min_iqs, BTR_NT_INTERNAL); - if (ret < 0 && ret != -E_BTR_EOF) /* fatal error */ - goto out; - if (ret <= 0 && !pod->have_more) /* nothing to do */ + if (ret < 0) { + if (ret != -E_BTR_EOF) /* fatal error */ + goto out; + if (fn->min_iqs == 0 && !pod->have_more) /* EOF */ + goto out; + /* last ov_read() returned OV_HOLE */ + } else if (ret == 0 && !pod->have_more) /* nothing to do */ goto out; if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE) return; @@ -255,7 +259,7 @@ static void ogg_post_select(__a_unused struct sched *s, struct task *t) out: t->error = ret; if (ret < 0) - btr_remove_node(btrn); + btr_remove_node(&fn->btrn); } /**