Linux stuff, cleaner compiling

Author: menno

common/mp4ff/private.h

@@ -15,6 +15,7 @@ typedef __int32 int32_t;
 typedef unsigned __int32 uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
+typedef __int64 off_t;
 #else
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
@@ -463,9 +464,9 @@ typedef struct
 {
     size_t (*read)(void *buffer, size_t length);
     size_t (*write)(void *buffer, size_t length);
-    int64_t (*get_position)();
-    int64_t (*get_length)();
-    int (*seek)(int64_t position);
+    off_t (*get_position)();
+    off_t (*get_length)();
+    int (*seek)(off_t position);
 } mp4_callback_t;
 
 typedef struct

configure.in

@@ -1,5 +1,5 @@
 AC_INIT
-AM_INIT_AUTOMAKE(faad2, 2.0)
+AM_INIT_AUTOMAKE(faad2, 2.0.rc3)
 
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)

faad2.spec

@@ -1,6 +1,6 @@
 Summary:    C library and frontend for decoding MPEG2/4 AAC
 Name:       faad2
-Version:    2.0.031106
+Version:    2.0.rc3
 Release:    1
 License:    GPL
 Group:      Applications/Multimedia
@@ -55,11 +55,12 @@ This is a Quicktime library for UNIX in a freely redistributable,
 statically linkable library.
 
 %prep
-%setup -n %{name}
+#%setup -n %{name}
+%setup -n %{name}-%{version}
 #%patch -p0
 
 %build
-sh bootstrap
+#sh bootstrap
 ./configure --with-drm --with-xmms --prefix=/usr
 make
 

frontend/main.c

@@ -22,13 +22,12 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through [email protected].
 **
-** $Id: main.c,v 1.59 2003/11/06 15:45:08 menno Exp $
+** $Id: main.c,v 1.60 2003/11/17 19:40:11 menno Exp $
 **/
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-typedef __int64 off_t;
 #else
 #include <time.h>
 #endif

libfaad/cfft.c

@@ -22,7 +22,7 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through [email protected].
 **
-** $Id: cfft.c,v 1.19 2003/11/12 20:47:57 menno Exp $
+** $Id: cfft.c,v 1.20 2003/11/17 19:40:11 menno Exp $
 **/
 
 /*
@@ -585,7 +585,7 @@ static void passf5(const uint16_t ido, const uint16_t l1, const complex_t *cc,
   ----------------------------------------------------------------------*/
 
 INLINE void cfftf1(uint16_t n, complex_t *c, complex_t *ch,
-                   uint16_t *ifac, complex_t *wa, int8_t isign)
+                   const uint16_t *ifac, const complex_t *wa, const int8_t isign)
 {
     uint16_t i;
     uint16_t k1, l1, l2;
@@ -610,27 +610,27 @@ INLINE void cfftf1(uint16_t n, complex_t *c, complex_t *ch,
             ix3 = ix2 + ido;
 
             if (na == 0)
-                passf4(ido, l1, c, ch, &wa[iw], &wa[ix2], &wa[ix3], isign);
+                passf4((const uint16_t)ido, (const uint16_t)l1, (const complex_t*)c, ch, &wa[iw], &wa[ix2], &wa[ix3], isign);
             else
-                passf4(ido, l1, ch, c, &wa[iw], &wa[ix2], &wa[ix3], isign);
+                passf4((const uint16_t)ido, (const uint16_t)l1, (const complex_t*)ch, c, &wa[iw], &wa[ix2], &wa[ix3], isign);
 
             na = 1 - na;
             break;
         case 2:
             if (na == 0)
-                passf2(ido, l1, c, ch, &wa[iw], isign);
+                passf2((const uint16_t)ido, (const uint16_t)l1, (const complex_t*)c, ch, &wa[iw], isign);
             else
-                passf2(ido, l1, ch, c, &wa[iw], isign);
+                passf2((const uint16_t)ido, (const uint16_t)l1, (const complex_t*)ch, c, &wa[iw], isign);
 
             na = 1 - na;
             break;
         case 3:
             ix2 = iw + ido;
 
             if (na == 0)
-                passf3(ido, l1, c, ch, &wa[iw], &wa[ix2], isign);
+                passf3((const uint16_t)ido, (const uint16_t)l1, (const complex_t*)c, ch, &wa[iw], &wa[ix2], isign);
             else
-                passf3(ido, l1, ch, c, &wa[iw], &wa[ix2], isign);
+                passf3((const uint16_t)ido, (const uint16_t)l1, (const complex_t*)ch, c, &wa[iw], &wa[ix2], isign);
 
             na = 1 - na;
             break;
@@ -640,9 +640,9 @@ INLINE void cfftf1(uint16_t n, complex_t *c, complex_t *ch,
             ix4 = ix3 + ido;
 
             if (na == 0)
-                passf5(ido, l1, c, ch, &wa[iw], &wa[ix2], &wa[ix3], &wa[ix4], isign);
+                passf5((const uint16_t)ido, (const uint16_t)l1, (const complex_t*)c, ch, &wa[iw], &wa[ix2], &wa[ix3], &wa[ix4], isign);
             else
-                passf5(ido, l1, ch, c, &wa[iw], &wa[ix2], &wa[ix3], &wa[ix4], isign);
+                passf5((const uint16_t)ido, (const uint16_t)l1, (const complex_t*)ch, c, &wa[iw], &wa[ix2], &wa[ix3], &wa[ix4], isign);
 
             na = 1 - na;
             break;
@@ -664,12 +664,12 @@ INLINE void cfftf1(uint16_t n, complex_t *c, complex_t *ch,
 
 void cfftf(cfft_info *cfft, complex_t *c)
 {
-    cfftf1(cfft->n, c, cfft->work, cfft->ifac, cfft->tab, -1);
+    cfftf1(cfft->n, c, cfft->work, (const uint16_t*)cfft->ifac, (const complex_t*)cfft->tab, -1);
 }
 
 void cfftb(cfft_info *cfft, complex_t *c)
 {
-    cfftf1(cfft->n, c, cfft->work, cfft->ifac, cfft->tab, +1);
+    cfftf1(cfft->n, c, cfft->work, (const uint16_t*)cfft->ifac, (const complex_t*)cfft->tab, +1);
 }
 
 static void cffti1(uint16_t n, complex_t *wa, uint16_t *ifac)
@@ -808,4 +808,5 @@ void cfftu(cfft_info *cfft)
 #endif
 
     if (cfft) free(cfft);
-}
+}
+

libfaad/cfft.h

@@ -22,7 +22,7 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through [email protected].
 **
-** $Id: cfft.h,v 1.12 2003/11/12 20:47:57 menno Exp $
+** $Id: cfft.h,v 1.13 2003/11/17 19:40:12 menno Exp $
 **/
 
 #ifndef __CFFT_H__
@@ -58,7 +58,7 @@ static void passf5(const uint16_t ido, const uint16_t l1, const complex_t *cc, c
                    const complex_t *wa1, const complex_t *wa2, const complex_t *wa3,
                    const complex_t *wa4, const int8_t isign);
 INLINE void cfftf1(uint16_t n, complex_t *c, complex_t *ch,
-                   uint16_t *ifac, complex_t *wa, int8_t isign);
+                   const uint16_t *ifac, const complex_t *wa, const int8_t isign);
 static void cffti1(uint16_t n, complex_t *wa, uint16_t *ifac);