From 0a611e34ea42f546efb30669ebd50753845f2fe2 Mon Sep 17 00:00:00 2001
From: Miguel Freitas <miguelfreitas@users.sourceforge.net>
Date: Fri, 9 Aug 2002 22:36:36 +0000
Subject: sync with faad2 cvs (no more fftw dependency)

CVS patchset: 2420
CVS date: 2002/08/09 22:36:36
---
 src/libfaad/mdct.h | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/libfaad/mdct.h')

diff --git a/src/libfaad/mdct.h b/src/libfaad/mdct.h
index 42b80eced..22622606e 100644
--- a/src/libfaad/mdct.h
+++ b/src/libfaad/mdct.h
@@ -16,7 +16,7 @@
 ** along with this program; if not, write to the Free Software 
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
-** $Id: mdct.h,v 1.1 2002/07/14 23:43:01 miguelfreitas Exp $
+** $Id: mdct.h,v 1.2 2002/08/09 22:36:36 miguelfreitas Exp $
 **/
 
 #ifndef __MDCT_H__
@@ -26,20 +26,37 @@
 extern "C" {
 #endif
 
+#ifdef USE_FFTW
 #include <fftw.h>
+#else
+#include "cfft.h"
+#endif
 
 typedef struct {
     real_t sin;
     real_t cos;
 } faad_sincos;
 
+#ifndef USE_FFTW
+typedef struct {
+    real_t re;
+    real_t im;
+} faad_complex;
+#endif
+
 typedef struct {
+    faad_sincos *sincos;
+#ifdef USE_FFTW
     fftw_complex *Z1;
     fftw_complex *Z2;
-    faad_sincos *sincos;
     fftw_plan plan_backward;
 #ifdef LTP_DEC
     fftw_plan plan_forward;
+#endif
+#else
+    real_t *Z1;
+    faad_complex *Z2;
+    cfft_info cfft;
 #endif
     uint16_t N;
 } mdct_info;
-- 
cgit v1.2.3