shithub: aacenc

Download patch

ref: c484946e5db501ce5de17256c1954dc79ccf7113
parent: 725acfc45ff162d0bfb1896a9e7d8b9375348bf3
author: menno <menno>
date: Mon May 28 14:12:32 EDT 2001 

Small bugfix in backward predictor


--- a/frontend/main.c
+++ b/frontend/main.c
@@ -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: main.c,v 1.16 2001/05/08 13:19:08 menno Exp $
+ * $Id: main.c,v 1.17 2001/05/28 18:12:32 menno Exp $
  */
 
 #ifdef _WIN32
@@ -56,7 +56,7 @@
 	FILE *outfile;
 
 #ifdef __unix__
-	struct rusage *usage;
+	struct rusage usage;
 #endif
 #ifdef _WIN32
 	long begin, end;
@@ -222,9 +222,9 @@
 		printf("Encoding %s took:\t%d:%.2d\t\n", argv[argc-2], nMins, nSecs);
 #else
 #ifdef __unix__
-		getrusage(RUSAGE_SELF,usage);
+		getrusage(RUSAGE_SELF,&usage);
 		if (usage) {
-			totalSecs=usage->ru_utime.tv_sec;
+			totalSecs=usage.ru_utime.tv_sec;
 			mins = totalSecs/60;
 			printf("Encoding %s took: %i min, %.2f sec. of cpu-time\n", argv[argc-2], mins, totalSecs - (60 * mins));
 		}
--- a/include/faac.h
+++ b/include/faac.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: faac.h,v 1.8 2001/05/18 21:02:37 menno Exp $
+ * $Id: faac.h,v 1.9 2001/05/28 18:12:32 menno Exp $
  */
 
 #ifndef FAACLIB_H
@@ -38,7 +38,7 @@
 #endif
 
 #define FAACENC_VERSION 1.0
-#define FAACENC_VERSIONB 0 /* If 1 this version is still in beta */
+#define FAACENC_VERSIONB 1 /* If 1 this version is still in beta */
 
 /* MPEG ID's */
 #define MPEG2 1
--- a/libfaac/backpred.h
+++ b/libfaac/backpred.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: backpred.h,v 1.2 2001/05/18 13:38:19 menno Exp $
+ * $Id: backpred.h,v 1.3 2001/05/28 18:12:32 menno Exp $
  */
 
 #ifndef _AAC_BACK_H_INCLUDED
@@ -43,7 +43,7 @@
 						ChannelInfo *channelInfo,
 						int chanNum); 
 
-void PredInit();
+void PredInit(faacEncHandle hEncoder);
 
 void CopyPredInfo(CoderInfo *right, CoderInfo *left);
 
--- a/libfaac/frame.c
+++ b/libfaac/frame.c
@@ -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: frame.c,v 1.19 2001/05/02 05:39:14 menno Exp $
+ * $Id: frame.c,v 1.20 2001/05/28 18:12:32 menno Exp $
  */
 
 /*
@@ -147,7 +147,7 @@
 
 	LtpInit(hEncoder);
 
-	PredInit();
+	PredInit(hEncoder);
 
 	AACQuantizeInit(hEncoder->coderInfo, hEncoder->numChannels);