Merge branch 'gerrit'

diff --git a/aacdec_filter.c b/aacdec_filter.c
index d9226b0..1ceca1f 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -62,7 +62,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) {