Merge remote-tracking branch 's/master'

[paraslash.git] / aacdec_filter.c

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 92f33d56eb03db7c67f3622246d49c0556b2d6bd..6c843799ba04446e6d6a14357e96c1cf7d6c5465 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -11,7 +11,6 @@
 /** \file aacdec_filter.c paraslash's aac (m4a) decoder. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
@@ -167,6 +166,11 @@ next_buffer:
                ret = -E_AAC_DECODE;
                if (padd->error_count++ > MAX_ERRORS)
                        goto err;
+               /* Suppress non-fatal bitstream error message at BOF/EOF */
+               if (len < fn->min_iqs || padd->consumed_total == 0) {
+                       consumed = len;
+                       goto success;
+               }
                PARA_ERROR_LOG("%s\n", NeAACDecGetErrorMessage(err));
                PARA_ERROR_LOG("consumed: %zu + %zd + %lu\n",
                        padd->consumed_total, consumed,