X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_common.c;h=8fc9523c28736e8e3b4add4551fff1ff38db23d3;hp=fda6346011c5aae30c6ede3fc0f8347ef838e161;hb=2557001e2e0a6c078c7907a021362e29e534822a;hpb=6bdac07456cb5872f824028912d1049883a9c21f diff --git a/aac_common.c b/aac_common.c index fda63460..8fc9523c 100644 --- a/aac_common.c +++ b/aac_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 Andre Noll + * Copyright (C) 2006 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,15 +8,16 @@ * 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" /** - * get a new libfaad decoder handle + * Get a new libfaad decoder handle. * + * \return The handle returned by NeAACDecOpen(). */ NeAACDecHandle aac_open(void) { @@ -28,9 +29,9 @@ NeAACDecHandle aac_open(void) c->downMatrix = 0; NeAACDecSetConfiguration(h, c); 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; @@ -58,13 +59,13 @@ 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') @@ -107,13 +108,13 @@ 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;