X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=c49f30dea858f05c627a820685fd6538b55eb07d;hp=5b2e9fba0a2b7b50fe25b35e166f66c92973858a;hb=8eaa28075189eea5db470422e8b4110df723cce3;hpb=486314426fcd25e5271fd65a982f8b321585e195

diff --git a/aac_afh.c b/aac_afh.c
index 5b2e9fba..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';
@@ -174,7 +164,7 @@ static ssize_t aac_compute_chunk_table(struct afh_info *afhi,
 	if (ret < 0)
 		return ret;
 	afhi->chunks_total = ret;
-	PARA_DEBUG_LOG("sz table has %lu entries\n", afhi->chunks_total);
+	PARA_DEBUG_LOG("sz table has %" PRIu32 " entries\n", afhi->chunks_total);
 	afhi->chunk_table = para_malloc((afhi->chunks_total + 1) * sizeof(size_t));
 	for (i = 1; i <= afhi->chunks_total; i++) {
 		if (skip + 4 > numbytes)
@@ -189,7 +179,7 @@ static ssize_t aac_compute_chunk_table(struct afh_info *afhi,
 }
 
 static int aac_set_chunk_tv(struct afh_info *afhi,
-		mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds)
+		mp4AudioSpecificConfig *mp4ASC, uint32_t *seconds)
 {
 	float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
 	struct timeval total;
@@ -200,7 +190,7 @@ static int aac_set_chunk_tv(struct afh_info *afhi,
 	ms = 1000.0 * afhi->chunks_total * tmp / mp4ASC->samplingFrequency;
 	ms2tv(ms, &total);
 	tv_divide(afhi->chunks_total, &total, &afhi->chunk_tv);
-	PARA_INFO_LOG("%luHz, %lus (%lu x %lums)\n",
+	PARA_INFO_LOG("%luHz, %lus (%" PRIu32 " x %lums)\n",
 		mp4ASC->samplingFrequency, ms / 1000,
 		afhi->chunks_total, tv2ms(&afhi->chunk_tv));
 	if (ms < 1000)
@@ -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
  *