X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=c49f30dea858f05c627a820685fd6538b55eb07d;hp=5018e2f4b09b7d0afce6b27ef88eb7dd2ce0c374;hb=224ab3f14af8e08a8a7159160eccea75be30ffd1;hpb=b8c3826d17840af9d994074fb4190d0ce66cbc05

diff --git a/aac_afh.c b/aac_afh.c
index 5018e2f4..c49f30de 100644
--- 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
  *