shithub: aacenc

Download patch

ref: 3e9040d441520435e99bc5c8543157c7a2606bc7
parent: 4f3f871c673d3d57c5939aa0c9237eb9cb05ceac
author: danchr <danchr>
date: Fri Apr 2 09:56:17 EST 2004

fix name clash w/ libavcodec: fft_init -> fft_initialize
bump version number to 1.24 beta

--- a/libfaac/fft.c
+++ b/libfaac/fft.c
@@ -1,6 +1,6 @@
 /*
  * FAAC - Freeware Advanced Audio Coder
- * $Id: fft.c,v 1.10 2003/11/16 05:02:51 stux Exp $
+ * $Id: fft.c,v 1.11 2004/04/02 14:56:17 danchr Exp $
  * Copyright (C) 2002 Krzysztof Nikiel
  *
  * This library is free software; you can redistribute it and/or
@@ -29,7 +29,7 @@
 #define MAXLOGM 9
 #define MAXLOGR 8
 
-void fft_init( FFT_Tables *fft_tables )
+void fft_initialize( FFT_Tables *fft_tables )
 {
 	int i;
 	fft_tables->costbl		= AllocMemory( (MAXLOGM+1) * sizeof( fft_tables->costbl[0] ) );
@@ -238,6 +238,10 @@
 
 /*
 $Log: fft.c,v $
+Revision 1.11  2004/04/02 14:56:17  danchr
+fix name clash w/ libavcodec: fft_init -> fft_initialize
+bump version number to 1.24 beta
+
 Revision 1.10  2003/11/16 05:02:51  stux
 moved global tables from fft.c into hEncoder FFT_Tables. Add fft_init and fft_terminate, flowed through all necessary changes. This should remove at least one instance of a memory leak, and fix some thread-safety problems. Version update to 1.23.3
 
--- a/libfaac/fft.h
+++ b/libfaac/fft.h
@@ -1,6 +1,6 @@
 /*
  * FAAC - Freeware Advanced Audio Coder
- * $Id: fft.h,v 1.4 2003/11/16 05:02:52 stux Exp $
+ * $Id: fft.h,v 1.5 2004/04/02 14:56:17 danchr Exp $
  * Copyright (C) 2002 Krzysztof Nikiel
  *
  * This library is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@
     unsigned short **reordertbl;
 } FFT_Tables;
 
-void fft_init		( FFT_Tables *fft_tables );
+void fft_initialize		( FFT_Tables *fft_tables );
 void fft_terminate	( FFT_Tables *fft_tables );
 
 void rfft			( FFT_Tables *fft_tables, double *x, int logm );
--- a/libfaac/frame.c
+++ b/libfaac/frame.c
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: frame.c,v 1.58 2004/03/17 13:34:20 danchr Exp $
+ * $Id: frame.c,v 1.59 2004/04/02 14:56:17 danchr Exp $
  */
 
 /*
@@ -357,7 +357,7 @@
     }
 
     /* Initialize coder functions */
-	fft_init( &hEncoder->fft_tables );
+	fft_initialize( &hEncoder->fft_tables );
     
 	hEncoder->psymodel->PsyInit(&hEncoder->gpsyInfo, hEncoder->psyInfo, hEncoder->numChannels,
         hEncoder->sampleRate, hEncoder->srInfo->cb_width_long,
@@ -944,6 +944,10 @@
 
 /*
 $Log: frame.c,v $
+Revision 1.59  2004/04/02 14:56:17  danchr
+fix name clash w/ libavcodec: fft_init -> fft_initialize
+bump version number to 1.24 beta
+
 Revision 1.58  2004/03/17 13:34:20  danchr
 Automatic, untuned setting of lowpass for VBR.
 
--- a/libfaac/version.h
+++ b/libfaac/version.h
@@ -1,6 +1,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define FAAC_VERSION "1.23.5"
+#define FAAC_VERSION "1.24 beta"
 
 #endif