Merge branch 't/unix_path_max_fix'

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 7de737068863df6d4a6233aa52628cbf53738921..7acb011df165a09a9536a850e7b736dbfa7b9eec 100644 (file)
--- 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.
  */
@@ -11,7 +11,6 @@
 /** \file aac_afh.c para_server's aac audio format handler */
 
 #include <regex.h>
-#include <osl.h>
 
 #include "para.h"
 #include "error.h"
@@ -43,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;
@@ -192,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;