aac: error cleanup

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index eda696274f812e6d7c4a723d48879b203da458a9..b70f7b477094478b6b20267e582a459b386c040f 100644 (file)
--- a/error.h
+++ b/error.h
@@ -193,11 +193,14 @@ extern const char **para_errlist[];
 #define AAC_AFH_ERRORS \
        PARA_ERROR(AAC_REPOS, "aac repositioning error"), \
        PARA_ERROR(AAC_READ, "aac read error"), \
+       PARA_ERROR(STSZ, "did not find stcz atom"), \
 
 
 #define AAC_COMMON_ERRORS \
-       PARA_ERROR(AAC_OPEN, "NeAACDecOpen() failed"), \
        PARA_ERROR(AAC_BUF, "invalid buffer"), \
+       PARA_ERROR(ESDS, "did not find esds atom"), \
+       PARA_ERROR(STCO, "did not find stco atom"), \
+
 
 #define OGG_ERRORS \
        PARA_ERROR(OGG_READ, "ogg read error"), \
@@ -349,9 +352,6 @@ extern const char **para_errlist[];
 
 #define AACDEC_ERRORS \
        PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
-       PARA_ERROR(ESDS, "did not find esds atom"), \
-       PARA_ERROR(STSZ, "did not find stsz atom"), \
-       PARA_ERROR(STCO, "did not find stco atom"), \
        PARA_ERROR(AAC_DECODE, "aac decode error"), \
 
 /* these do not need error handling (yet) */