X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_common.c;h=812c742cf668e7ad67e6f5b502fbe6c93829f0a3;hp=9e46a77ca27af1e2b433b5bf68ad4cac61878226;hb=dda88dcb390a44e1f1f68f6248ed513c75dce4bf;hpb=ae8073c5441aeee5d3b63840e84d8c33e2c583ee

diff --git a/aac_common.c b/aac_common.c
index 9e46a77c..812c742c 100644
--- a/aac_common.c
+++ b/aac_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,11 +8,12 @@
  * Ahead Software AG
  */
 
-/** \file aac_common.c common functions of aac_afh and aadcec */
+/** \file aac_common.c Common functions of aac_afh and aadcec. */
 
 #include "para.h"
 #include "aac.h"
 #include "error.h"
+#include "portable_io.h"
 
 /**
  * Get a new libfaad decoder handle.
@@ -31,7 +32,7 @@ NeAACDecHandle aac_open(void)
 	return h;
 }
 
-static unsigned long aac_read_decoder_length(unsigned char *buf, int *description_len)
+static unsigned long aac_read_decoder_length(char *buf, int *description_len)
 {
 	uint8_t b;
 	uint8_t numBytes = 0;
@@ -59,31 +60,31 @@ static unsigned long aac_read_decoder_length(unsigned char *buf, int *descriptio
  *
  * \return positive on success, negative on errors
  */
-int aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip,
+int aac_find_esds(char *buf, size_t buflen, size_t *skip,
 		unsigned long *decoder_length)
 {
 	size_t i;
 
 	for (i = 0; i + 4 < buflen; i++) {
-		unsigned char *p = buf + i;
+		char *p = buf + i;
 		int description_len;
 
 		if (p[0] != 'e' || p[1] != 's' || p[2] != 'd' || p[3] != 's')
 			continue;
 		i += 8;
 		p = buf + i;
-		PARA_INFO_LOG("found esds@%zu, next: %x\n", i, *p);
+		PARA_INFO_LOG("found esds@%zu, next: %x\n", i, (unsigned)*p);
 		if (*p == 3)
 			i += 8;
 		else
 			i += 6;
 		p = buf + i;
-		PARA_INFO_LOG("next: %x\n", *p);
+		PARA_INFO_LOG("next: %x\n", (unsigned)*p);
 		if (*p != 4)
 			continue;
 		i += 18;
 		p = buf + i;
-		PARA_INFO_LOG("next: %x\n", *p);
+		PARA_INFO_LOG("next: %x\n", (unsigned)*p);
 		if (*p != 5)
 			continue;
 		i++;
@@ -108,19 +109,19 @@ int aac_find_esds(unsigned char *buf, size_t buflen, size_t *skip,
  * \return the position of the first entry in the table on success,
  * -E_STCO on errors.
  */
-ssize_t aac_find_entry_point(unsigned char *buf, size_t buflen, size_t *skip)
+ssize_t aac_find_entry_point(char *buf, size_t buflen, size_t *skip)
 {
 	ssize_t ret;
 	size_t i;
 
 	for (i = 0; i + 20 < buflen; i++) {
-		unsigned char *p = buf + i;
+		char *p = buf + i;
 
 		if (p[0] != 's' || p[1] != 't' || p[2] != 'c' || p[3] != 'o')
 			continue;
 		PARA_INFO_LOG("found stco@%zu\n", i);
 		i += 12;
-		ret = aac_read_int32(buf + i); /* first offset */
+		ret = read_u32_be(buf + i); /* first offset */
 		i += 4;
 		PARA_INFO_LOG("entry point: %zd\n", ret);
 		*skip = i;