X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=7acb011df165a09a9536a850e7b736dbfa7b9eec;hp=04461178bb7912e3fb893cc5cf0215d39f965368;hb=a7a72ca4acf7f44abca866d410e2bc80590e7fab;hpb=299df142bb50bacebc0b3050768f941bc95b5b6f

diff --git a/aac_afh.c b/aac_afh.c
index 04461178..7acb011d 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -10,7 +10,7 @@
 
 /** \file aac_afh.c para_server's aac audio format handler */
 
-#include <osl.h>
+#include <regex.h>
 
 #include "para.h"
 #include "error.h"
@@ -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;