X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=a851f8df91fb9c98fb247a086402c821916b72fc;hp=d12dfa19ca8eb59f7a47951665941d63fd8ba1a6;hb=4744d937c4160898d1fe151257606430750e580c;hpb=63c4f3404cfb3aea943949d81b03bca14dbea559 diff --git a/aac_afh.c b/aac_afh.c index d12dfa19..a851f8df 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2008 Andre Noll + * Copyright (C) 2006-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,7 +8,7 @@ * Ahead Software AG */ -/** \file aac_afh.c para_server's aac audio format handler */ +/** \file aac_afh.c para_server's aac audio format handler. */ #include @@ -42,9 +42,9 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip) return -E_STSZ; } -static int atom_cmp(unsigned char *buf1, char *buf2) +static int atom_cmp(const unsigned char *buf1, const char *buf2) { - unsigned char *b2 = (unsigned char *)buf2; + const unsigned char *b2 = (unsigned char *)buf2; if (buf1[0] != b2[0]) return 1; @@ -191,8 +191,7 @@ static int aac_set_chunk_tv(struct afh_info *afhi, { float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023; struct timeval total; - long unsigned ms = 1000.0 * afhi->chunks_total * tmp - / mp4ASC->samplingFrequency; + long unsigned ms; if (!mp4ASC->samplingFrequency) return -E_MP4ASC;