X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec.c;h=2f2a1ad4bcb9ddf722bf72934f94d518e56206a6;hp=89781c528d9f107a65d75cf120cd9eb412c47271;hb=4df56926d10669ec120510957d3aa3fddb16e3c6;hpb=203bfcadc14507f4d01f99099efec8ee976556b1

diff --git a/aacdec.c b/aacdec.c
index 89781c52..2f2a1ad4 100644
--- a/aacdec.c
+++ b/aacdec.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /*
  * based in parts on libfaad, Copyright (C) 2003-2005 M. Bakker,
@@ -53,7 +41,7 @@ struct private_aacdec_data {
 	 * return value of aac_find_esds(). Used to call the right aacdec
 	 * init function
 	 */
-	int decoder_length;
+	unsigned long decoder_length;
 	/** number of times the decoder returned an error */
 	unsigned error_count;
 	/** number of bytes already consumed from the imput stream */
@@ -79,9 +67,9 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 	if (!padd->initialized) {
 		unsigned long rate = 0;
 		unsigned char channels = 0;
-		padd->decoder_length = aac_find_esds(inbuf, len, &skip);
-		PARA_INFO_LOG("decoder len: %d\n", padd->decoder_length);
-		if (padd->decoder_length < 0) {
+		ret = aac_find_esds(inbuf, len, &skip, &padd->decoder_length);
+		if (ret < 0) {
+			PARA_INFO_LOG("%s\n", PARA_STRERROR(-ret));
 			ret = NeAACDecInit(padd->handle, inbuf,
 				len, &rate, &channels);
 			PARA_INFO_LOG("decoder init: %d\n", ret);
@@ -91,6 +79,8 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 			}
 			consumed = ret;
 		} else {
+			PARA_INFO_LOG("decoder len: %lu\n",
+				padd->decoder_length);
 			consumed += skip;
 			p = inbuf + consumed;
 			ret = -E_AACDEC_INIT;