X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=c49f30dea858f05c627a820685fd6538b55eb07d;hp=04d74e8ed91ce1c54d67f675d301c8a139c2f6c3;hb=b74bb1b8dbd1fbe2bbd918ae7a77ebafba674e7c;hpb=73073e4f4209c874f2f41e270376a9802862df8f

diff --git a/aac_afh.c b/aac_afh.c
index 04d74e8e..c49f30de 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -46,23 +46,13 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
 
 static int atom_cmp(const unsigned char *buf1, const char *buf2)
 {
-	const unsigned char *b2 = (unsigned char *)buf2;
-
-	if (buf1[0] != b2[0])
-		return 1;
-	if (buf1[1] != b2[1])
-		return 1;
-	if (buf1[2] != b2[2])
-		return 1;
-	if (buf1[3] != b2[3])
-		return 1;
-	return 0;
+	return memcmp(buf1, buf2, 4)? 1 : 0;
 }
 
 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';
@@ -327,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
  *