wmadec: Properly handle empty outputs.

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 5018e2f4b09b7d0afce6b27ef88eb7dd2ce0c374..c49f30dea858f05c627a820685fd6538b55eb07d 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -52,7 +52,7 @@ static int atom_cmp(const unsigned char *buf1, const char *buf2)
 static int read_atom_header(unsigned char *buf, uint64_t *subsize, unsigned char type[5])
 {
        int i;
-       uint64_t size = (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + buf[3];
+       uint64_t size = aac_read_int32(buf);
 
        memcpy(type, buf + 4, 4);
        type[4] = '\0';
@@ -317,7 +317,7 @@ close:
        return ret;
 }
 
-static const char* aac_suffixes[] = {"m4a", "mp4", NULL};
+static const char * const aac_suffixes[] = {"m4a", "mp4", NULL};
 /**
  * the init function of the aac audio format handler
  *