X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=be301c5ce38f530bf29ddef4781f89c4d2b4926b;hp=126eb6ce58b58339ce9530898f514e21673bcdca;hb=bd38899d7d8cd4043bfee85fcdb55159ca5ba1a2;hpb=ae0e4594c6a0312c5b4b4c0bde86f9c12253d11b

diff --git a/aac_afh.c b/aac_afh.c
index 126eb6ce..be301c5c 100644
--- a/aac_afh.c
+++ b/aac_afh.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,
@@ -113,12 +101,11 @@ static int aac_get_file_info(char *map, size_t numbytes,
 	NeAACDecHandle handle;
 	unsigned char *umap = (unsigned char *) map;
 
-	ret = aac_find_esds(umap, numbytes, &skip);
+	ret = aac_find_esds(umap, numbytes, &skip, &decoder_len);
 	if (ret < 0)
 		goto out;
-	decoder_len = ret;
 	handle = aac_open();
-	ret = -E_AACDEC_INIT;
+	ret = -E_AAC_AFH_INIT;
 	if (NeAACDecInit(handle, umap + skip, decoder_len, &rate, &channels))
 		goto out;
 	if (!channels)