shithub: aacenc

Download patch

ref: b85e7ca5bae6a13dfab2bbac39da1f9b759e4301
parent: 6fb9f675c8b2a6133e6d5a01f1e01365145aa8ed
author: menno <menno>
date: Fri Jun 5 12:32:15 EDT 2009

Minor fixes, cleanup

--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@
 
 AC_DEFUN([MY_DEFINE], [ AC_DEFINE($1, 1, [define if needed]) ])
 
-CFLAGS=${CFLAGS:-"-O2 -Wall"}
+CFLAGS=${CFLAGS:-"-O2 -Wall -fexceptions"}
 
 AC_PROG_CC
 AC_PROG_CXX
--- a/libfaac/psych.h
+++ b/libfaac/psych.h
@@ -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: psych.h,v 1.14 2005/04/24 19:16:14 rjamorim Exp $
+ * $Id: psych.h,v 1.15 2009/06/05 16:32:15 menno Exp $
  */
 
 #ifndef PSYCH_H
@@ -40,7 +40,6 @@
 
 	/* Previous input samples */
 	double *prevSamples;
-	double *prevSamplesS;
 
 	int block_type;
 
--- a/libfaac/psychkni.c
+++ b/libfaac/psychkni.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: psychkni.c,v 1.17 2005/04/24 19:16:14 rjamorim Exp $
+ * $Id: psychkni.c,v 1.18 2009/06/05 16:32:15 menno Exp $
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -231,10 +231,6 @@
 
     psyInfo[channel].sizeS = size;
 
-    psyInfo[channel].prevSamplesS =
-      (double *) AllocMemory(size * sizeof(double));
-    memset(psyInfo[channel].prevSamplesS, 0, size * sizeof(double));
-
     for (j = 0; j < 8; j++)
     {
       psydata->fftEnrgPrevS[j] =
@@ -273,8 +269,6 @@
   {
     psydata_t *psydata = psyInfo[channel].data;
 
-    if (psyInfo[channel].prevSamplesS)
-      FreeMemory(psyInfo[channel].prevSamplesS);
     for (j = 0; j < 8; j++)
     {
       if (psydata->fftEnrgPrevS[j])