X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aacdec.c;h=235b292d33168d74150bb8534f03caa0a365ce64;hp=79c437d52b11f65b294ceac8ea9d7e995a4bd5ce;hb=62414974b55d78a67d4170da85091a915087219f;hpb=f695fe47a8a6509379225c837dadfa9837a7d746

diff --git a/aacdec.c b/aacdec.c
index 79c437d5..235b292d 100644
--- a/aacdec.c
+++ b/aacdec.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 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,
@@ -73,7 +61,7 @@ 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_eof)
+	if (len < 2048 && !*fc->input_error)
 		return 0;
 
 	if (!padd->initialized) {
@@ -81,7 +69,7 @@ static ssize_t aacdec(char *input_buffer, size_t len, struct filter_node *fn)
 		unsigned char channels = 0;
 		ret = aac_find_esds(inbuf, len, &skip, &padd->decoder_length);
 		if (ret < 0) {
-			PARA_INFO_LOG("%s\n", PARA_STRERROR(-ret));
+			PARA_INFO_LOG("%s\n", para_strerror(-ret));
 			ret = NeAACDecInit(padd->handle, inbuf,
 				len, &rate, &channels);
 			PARA_INFO_LOG("decoder init: %d\n", ret);