shithub: aacdec

Download patch

ref: e6651e57c8f32b278a94e36b75ab94ffb193a293
parent: 69a466f523d183c679db07ef1b4da04ec3b0089c
author: menno <menno>
date: Tue Sep 24 05:23:55 EDT 2002 

Fixed other than 16 bit decoding for MP4 files


--- a/frontend/faad.dsp
+++ b/frontend/faad.dsp
@@ -25,7 +25,7 @@
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=xicl6.exe

+CPP=cl.exe

 RSC=rc.exe

 

 !IF  "$(CFG)" == "faad - Win32 Release"

@@ -48,7 +48,7 @@
 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-LINK32=xilink6.exe

+LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

 # ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /profile /machine:I386

 

@@ -72,7 +72,7 @@
 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-LINK32=xilink6.exe

+LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 

@@ -88,6 +88,10 @@
 # Begin Source File

 

 SOURCE=.\audio.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\libfaad\cfft.c

 # End Source File

 # Begin Source File

 

--- 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.23 2002/08/26 19:08:39 menno Exp $
+** $Id: main.c,v 1.24 2002/09/24 09:23:55 menno Exp $
 **/
 
 #ifdef _WIN32
@@ -344,6 +344,7 @@
     audio_file *aufile;
 
     faacDecHandle hDecoder;
+    faacDecConfigurationPtr config;
     faacDecFrameInfo frameInfo;
 
     unsigned char *buffer;
@@ -355,6 +356,11 @@
     int first_time = 1;
 
     hDecoder = faacDecOpen();
+
+    /* Set configuration */
+    config = faacDecGetCurrentConfiguration(hDecoder);
+    config->outputFormat = outputFormat;
+    faacDecSetConfiguration(hDecoder, config);
 
 	infile = MP4Read(mp4file, 0);
 	if (!infile)