X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec_filter.c;h=59c49893f59acc58a6df8c5d8b7386b8008c3dca;hp=8eddc0e71566d7c9cb816a5d52d70e5d35bb5b84;hb=df6606e438a34c7bfc325e5f320843d1e97d3f7a;hpb=ebe54cf6ee1b9c5daf7837cb618c299a5b5187e0;ds=sidebyside diff --git a/aacdec_filter.c b/aacdec_filter.c index 8eddc0e7..59c49893 100644 --- a/aacdec_filter.c +++ b/aacdec_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2008 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -10,8 +10,9 @@ /** \file aacdec_filter.c paraslash's aac (m4a) decoder. */ -#include "para.h" +#include +#include "para.h" #include "list.h" #include "sched.h" #include "ggo.h" @@ -62,7 +63,10 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn) if (fn->loaded > fn->bufsize * 3 / 5) return 0; - if (len < 2048 && !*fc->input_error) + ret = *fc->input_error; + if (ret < 0) + return ret; + if (len < 2048) return 0; if (!padd->initialized) {