X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec_filter.c;h=c8b60925ee853de9dec170a733c2a06f35807453;hp=92f33d56eb03db7c67f3622246d49c0556b2d6bd;hb=6d9c357ff64e799dfeacda6a176012de10c7f5c1;hpb=412644d90875f8d361e0e587e3a0e1e7cb89b252

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 92f33d56..c8b60925 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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,
@@ -200,7 +204,7 @@ out:
 err:
 	assert(ret < 0);
 	t->error = ret;
-	btr_remove_node(btrn);
+	btr_remove_node(&fn->btrn);
 }
 
 /**