Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 126eb6ce58b58339ce9530898f514e21673bcdca..0a352c886164e858001fec0397da3aba7cab7cfb 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -113,12 +113,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)