X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aacdec_filter.c;h=ae3a90e6c908391869ed551d5443f8e570089306;hb=4403d70f8ec547a17fcce25b0ba997e208732248;hp=d9226b0d8d37e221ef6ac2f15e383a1063389241;hpb=002731cd3938f3be6b71651e56c062af1adcdec0;p=paraslash.git diff --git a/aacdec_filter.c b/aacdec_filter.c index d9226b0d..ae3a90e6 100644 --- a/aacdec_filter.c +++ b/aacdec_filter.c @@ -10,11 +10,14 @@ /** \file aacdec_filter.c paraslash's aac (m4a) decoder. */ -#include "para.h" +#include +#include +#include "para.h" #include "list.h" #include "sched.h" #include "ggo.h" +#include "buffer_tree.h" #include "filter.h" #include "error.h" #include "string.h" @@ -62,7 +65,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) {