shithub: aacdec

Download patch

ref: 220c2d5ae2a847b59fa5fc27cfdbe5f55934cc54
parent: b98919ac46cb331ea5fcd6bd4c30db272e6f4a63
author: menno <menno>
date: Sun Jan 25 15:25:29 EST 2009

Update project files

--- a/aacDECdrop/aacDECdrop/aacDECdrop.dsp
+++ /dev/null
@@ -1,163 +1,0 @@
-# Microsoft Developer Studio Project File - Name="aacDECdrop" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Application" 0x0101
-
-CFG=aacDECdrop - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "aacDECdrop.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "aacDECdrop.mak" CFG="aacDECdrop - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "aacDECdrop - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "aacDECdrop - Win32 Debug" (based on "Win32 (x86) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "aacDECdrop - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /MD /GX /O2 /I "..\..\include" /I "..\..\common\mp4ff" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /QaxK /Qsox- /Qip /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /nologo /subsystem:windows /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 winmm.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"LIBCMT.lib"
-
-!ELSEIF  "$(CFG)" == "aacDECdrop - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\common\mp4ff" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ws2_32.lib winmm.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:windows /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "aacDECdrop - Win32 Release"
-# Name "aacDECdrop - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\audio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\decode.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\decthread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\main.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\misc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\wave_out.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\audio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\decode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\decthread.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\misc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\wave_out.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=..\resource\AAC01.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=..\resource\AAC01.ico
-# End Source File
-# Begin Source File
-
-SOURCE=..\Script.rc
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/aacDECdrop/aacDECdrop/aacDECdrop.dsw
+++ /dev/null
@@ -1,59 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "aacDECdrop"=.\aacDECdrop.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libfaad
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mp4ff
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libfaad"=..\..\libfaad\libfaad.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "mp4ff"=..\..\common\mp4ff\mp4ff.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/common/faad/aacinfo.dsp
+++ /dev/null
@@ -1,110 +1,0 @@
-# Microsoft Developer Studio Project File - Name="aacinfo" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=aacinfo - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "aacinfo.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "aacinfo.mak" CFG="aacinfo - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "aacinfo - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "aacinfo - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "aacinfo - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "TEST" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.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 /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 /machine:I386
-
-!ELSEIF  "$(CFG)" == "aacinfo - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "TEST" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.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 /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
-
-!ENDIF 
-
-# Begin Target
-
-# Name "aacinfo - Win32 Release"
-# Name "aacinfo - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\aacinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\filestream.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\aacinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\filestream.h
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/common/faad/aacinfo.dsw
+++ /dev/null
@@ -1,29 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "aacinfo"=.\aacinfo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/common/faad/aacinfo.sln
+++ b/common/faad/aacinfo.sln
@@ -1,21 +1,19 @@
-Microsoft Visual Studio Solution File, Format Version 7.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aacinfo", "aacinfo.vcproj", "{FE985E4D-79DB-4DD3-BFED-824B4677A161}"
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		ConfigName.0 = Debug
-		ConfigName.1 = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{FE985E4D-79DB-4DD3-BFED-824B4677A161}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FE985E4D-79DB-4DD3-BFED-824B4677A161}.Debug|Win32.Build.0 = Debug|Win32
+		{FE985E4D-79DB-4DD3-BFED-824B4677A161}.Release|Win32.ActiveCfg = Release|Win32
+		{FE985E4D-79DB-4DD3-BFED-824B4677A161}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{FE985E4D-79DB-4DD3-BFED-824B4677A161}.Debug.ActiveCfg = Debug|Win32
-		{FE985E4D-79DB-4DD3-BFED-824B4677A161}.Debug.Build.0 = Debug|Win32
-		{FE985E4D-79DB-4DD3-BFED-824B4677A161}.Release.ActiveCfg = Release|Win32
-		{FE985E4D-79DB-4DD3-BFED-824B4677A161}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
--- a/common/faad/aacinfo.vcproj
+++ b/common/faad/aacinfo.vcproj
@@ -1,14 +1,17 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.00"
+	Version="8.00"
 	Name="aacinfo"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{FE985E4D-79DB-4DD3-BFED-824B4677A161}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
@@ -15,52 +18,88 @@
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/aacinfo.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				PreprocessorDefinitions="_DEBUG,WIN32,_CONSOLE,TEST"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug/aacinfo.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1043"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\Debug/aacinfo.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/aacinfo.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/aacinfo.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1043"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -67,72 +106,116 @@
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/aacinfo.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				PreprocessorDefinitions="NDEBUG,WIN32,_CONSOLE,TEST"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/aacinfo.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="true"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1043"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\Release/aacinfo.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/aacinfo.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/aacinfo.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1043"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\aacinfo.c">
+				RelativePath=".\aacinfo.c"
+				>
 			</File>
 			<File
-				RelativePath=".\filestream.c">
+				RelativePath=".\filestream.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\aacinfo.h">
+				RelativePath=".\aacinfo.h"
+				>
 			</File>
 			<File
-				RelativePath=".\filestream.h">
+				RelativePath=".\filestream.h"
+				>
 			</File>
 		</Filter>
 	</Files>
--- a/common/mp4ff/mp4ff.dsp
+++ /dev/null
@@ -1,144 +1,0 @@
-# Microsoft Developer Studio Project File - Name="mp4ff" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=mp4ff - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "mp4ff.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "mp4ff.mak" CFG="mp4ff - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "mp4ff - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "mp4ff - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "mp4ff - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-F90=df.exe
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_TAGGING" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "mp4ff - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-F90=df.exe
-MTL=midl.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_TAGGING" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=xilink6.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "mp4ff - Win32 Release"
-# Name "mp4ff - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\drms.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4atom.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4ff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4meta.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4sample.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4tagupdate.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4util.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\drms.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\drmstables.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4ff.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4ff_int_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4ffint.h
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/frontend/faad.dsp
+++ /dev/null
@@ -1,127 +1,0 @@
-# Microsoft Developer Studio Project File - Name="faad" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=faad - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "faad.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "faad.mak" CFG="faad - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "faad - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "faad - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "faad - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /I "../include" /I "../common/mp4ff" /I "../common/faad" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.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 Advapi32.lib /nologo /subsystem:console /machine:I386
-# SUBTRACT LINK32 /profile
-
-!ELSEIF  "$(CFG)" == "faad - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "../include" /I "../common/mp4ff" /I "../common/faad" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.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 Advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "faad - Win32 Release"
-# Name "faad - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\audio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\faad\getopt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\main.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\audio.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\faad\getopt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\mp4ff\mp4ff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\common\mp4ff\mp4ff_int_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\include\neaacdec.h
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/frontend/faad.dsw
+++ /dev/null
@@ -1,59 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "faad"=.\faad.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libfaad
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mp4ff
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libfaad"=..\libfaad\libfaad.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "mp4ff"=..\common\mp4ff\mp4ff.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/libfaad/libfaad.dsp
+++ /dev/null
@@ -1,484 +1,0 @@
-# Microsoft Developer Studio Project File - Name="libfaad" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libfaad - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libfaad.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libfaad.mak" CFG="libfaad - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libfaad - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libfaad - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libfaad - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-MTL=midl.exe
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "libfaad - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-MTL=midl.exe
-F90=df.exe
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libfaad - Win32 Release"
-# Name "libfaad - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\bits.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfft.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\common.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\decoder.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\drc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\drm_dec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\error.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\filtbank.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\hcr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\huffman.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ic_predict.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\is.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\lt_predict.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mdct.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ms.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\output.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pns.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ps_dec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ps_syntax.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pulse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rvlc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_dct.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_dec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_e_nf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_fbt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_hfadj.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_hfgen.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_huff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_qmf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_syntax.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_tf_grid.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\specrec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssr_fb.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssr_ipqf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\syntax.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tns.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Group "codebook"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\codebook\hcb_1.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_10.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_11.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_2.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_3.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_4.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_5.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_6.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_7.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_8.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_9.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_sf.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\analysis.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\bits.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfft.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfft_tab.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\drc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\drm_dec.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\error.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\filtbank.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fixed.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\huffman.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ic_predict.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\iq_table.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\is.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\kbd_win.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\lt_predict.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mdct.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mdct_tab.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ms.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\output.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pns.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ps_dec.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ps_tables.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pulse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rvlc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_dct.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_dec.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_e_nf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_fbt.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_hfadj.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_hfgen.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_huff.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_noise.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_qmf.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_qmf_c.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_syntax.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_tf_grid.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sine_win.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\specrec.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\structs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\syntax.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tns.h
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/libfaad/libfaad.dsw
+++ /dev/null
@@ -1,29 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libfaad"=.\libfaad.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/libfaad/libfaad2.vcp
+++ /dev/null
@@ -1,2091 +1,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="libfaad2" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE x86) Static Library" 0x8304
-# TARGTYPE "Win32 (WCE ARM) Static Library" 0x8504
-
-CFG=libfaad2 - Win32 (WCE ARM) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libfaad2.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libfaad2.vcn" CFG="libfaad2 - Win32 (WCE ARM) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libfaad2 - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Static Library")
-!MESSAGE "libfaad2 - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Static Library")
-!MESSAGE "libfaad2 - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Static Library")
-!MESSAGE "libfaad2 - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMRel"
-# PROP BASE Intermediate_Dir "ARMRel"
-# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ARMRel"
-# PROP Intermediate_Dir "ARMRel"
-# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /GX- /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT)  /c
-# ADD CPP /nologo /W3 /GX- /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /Oxs /M$(CECrtMT)  /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMDbg"
-# PROP BASE Intermediate_Dir "ARMDbg"
-# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ARMDbg"
-# PROP Intermediate_Dir "ARMDbg"
-# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug)  /c
-# ADD CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug)  /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "X86Rel"
-# PROP BASE Intermediate_Dir "X86Rel"
-# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "X86Rel"
-# PROP Intermediate_Dir "X86Rel"
-# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX- /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /Oxs  /c
-# ADD CPP /nologo /W3 /GX- /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /Oxs  /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "X86Dbg"
-# PROP BASE Intermediate_Dir "X86Dbg"
-# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "X86Dbg"
-# PROP Intermediate_Dir "X86Dbg"
-# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF  /c
-# ADD CPP /nologo /W3 /GX- /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF  /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libfaad2 - Win32 (WCE ARM) Release"
-# Name "libfaad2 - Win32 (WCE ARM) Debug"
-# Name "libfaad2 - Win32 (WCE x86) Release"
-# Name "libfaad2 - Win32 (WCE x86) Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Group "codebook"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\codebook\hcb_1.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_1=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_1=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_1=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_1=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_10.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_10=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_10=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_10=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_10=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_11.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_11=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_11=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_11=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_11=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_2.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_2=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_2=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_2=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_2=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_3.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_3=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_3=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_3=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_3=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_4.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_4=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_4=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_4=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_4=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_5.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_5=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_5=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_5=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_5=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_6.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_6=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_6=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_6=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_6=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_7.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_7=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_7=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_7=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_7=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_8.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_8=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_8=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_8=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_8=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_9.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_9=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_9=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_9=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_9=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb_sf.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_HCB_S=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_HCB_S=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_HCB_S=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_HCB_S=\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\bits.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_BITS_=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_BITS_=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_BITS_=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_BITS_=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfft.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_CFFT_=\
-	".\cfft.h"\
-	".\cfft_tab.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CFFT_=\
-	".\cfft.h"\
-	".\cfft_tab.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_CFFT_=\
-	".\cfft.h"\
-	".\cfft_tab.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_CFFT_=\
-	".\cfft.h"\
-	".\cfft_tab.h"\
-	".\common.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\common.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_COMMO=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_COMMO=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_COMMO=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_COMMO=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\data.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_DATA_=\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_DATA_=\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_DATA_=\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_DATA_=\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\decoder.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_DECOD=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\dither.h"\
-	".\drc.h"\
-	".\error.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\is.h"\
-	".\lt_predict.h"\
-	".\mdct.h"\
-	".\mp4.h"\
-	".\ms.h"\
-	".\output.h"\
-	".\pns.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_DECOD=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\dither.h"\
-	".\drc.h"\
-	".\error.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\is.h"\
-	".\lt_predict.h"\
-	".\mdct.h"\
-	".\mp4.h"\
-	".\ms.h"\
-	".\output.h"\
-	".\pns.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_DECOD=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\dither.h"\
-	".\drc.h"\
-	".\error.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\is.h"\
-	".\lt_predict.h"\
-	".\mdct.h"\
-	".\mp4.h"\
-	".\ms.h"\
-	".\output.h"\
-	".\pns.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_DECOD=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\dither.h"\
-	".\drc.h"\
-	".\error.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\is.h"\
-	".\lt_predict.h"\
-	".\mdct.h"\
-	".\mp4.h"\
-	".\ms.h"\
-	".\output.h"\
-	".\pns.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\dither.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_DITHE=\
-	".\common.h"\
-	".\dither.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_DITHE=\
-	".\common.h"\
-	".\dither.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_DITHE=\
-	".\common.h"\
-	".\dither.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_DITHE=\
-	".\common.h"\
-	".\dither.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\drc.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_DRC_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\drc.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_DRC_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\drc.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_DRC_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\drc.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_DRC_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\drc.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\error.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_ERROR=\
-	".\common.h"\
-	".\error.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_ERROR=\
-	".\common.h"\
-	".\error.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_ERROR=\
-	".\common.h"\
-	".\error.h"\
-	".\fixed.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_ERROR=\
-	".\common.h"\
-	".\error.h"\
-	".\fixed.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\filtbank.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_FILTB=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\kbd_win.h"\
-	".\mdct.h"\
-	".\sine_win.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_FILTB=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\kbd_win.h"\
-	".\mdct.h"\
-	".\sine_win.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_FILTB=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\kbd_win.h"\
-	".\mdct.h"\
-	".\sine_win.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_FILTB=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\kbd_win.h"\
-	".\mdct.h"\
-	".\sine_win.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ic_predict.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_IC_PR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_IC_PR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_IC_PR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_IC_PR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\is.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_IS_C2c=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\is.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_IS_C2c=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\is.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_IS_C2c=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\is.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_IS_C2c=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\is.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\lt_predict.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_LT_PR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\lt_predict.h"\
-	".\mdct.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_LT_PR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\lt_predict.h"\
-	".\mdct.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_LT_PR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\lt_predict.h"\
-	".\mdct.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_LT_PR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\lt_predict.h"\
-	".\mdct.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\mdct.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_MDCT_=\
-	".\cfft.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\mdct.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_MDCT_=\
-	".\cfft.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\mdct.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_MDCT_=\
-	".\cfft.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\mdct.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_MDCT_=\
-	".\cfft.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\mdct.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_MP4_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\mp4.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_MP4_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\mp4.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_MP4_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\mp4.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_MP4_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\mp4.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\ms.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_MS_C34=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\is.h"\
-	".\ms.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_MS_C34=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\is.h"\
-	".\ms.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_MS_C34=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\is.h"\
-	".\ms.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_MS_C34=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\is.h"\
-	".\ms.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\output.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_OUTPU=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\decoder.h"\
-	".\dither.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\output.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_OUTPU=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\decoder.h"\
-	".\dither.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\output.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_OUTPU=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\decoder.h"\
-	".\dither.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\output.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_OUTPU=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\common.h"\
-	".\decoder.h"\
-	".\dither.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\output.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\pns.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_PNS_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_PNS_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_PNS_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_PNS_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\pns.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\pulse.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_PULSE=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\pulse.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_PULSE=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\pulse.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_PULSE=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\pulse.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_PULSE=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\pulse.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\reordered_spectral_data.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_REORD=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	".\pulse.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_REORD=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	".\pulse.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_REORD=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	".\pulse.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_REORD=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	".\pulse.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\rvlc_scale_factors.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_RVLC_=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\rvlc_scale_factors.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_RVLC_=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\rvlc_scale_factors.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_RVLC_=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\rvlc_scale_factors.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_RVLC_=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\rvlc_scale_factors.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\specrec.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_SPECR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	".\iq_table.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_SPECR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	".\iq_table.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_SPECR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	".\iq_table.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_SPECR=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\data.h"\
-	".\fixed.h"\
-	".\iq_table.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\syntax.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_SYNTA=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\huffman.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\pulse.h"\
-	".\rvlc_scale_factors.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_SYNTA=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\huffman.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\pulse.h"\
-	".\rvlc_scale_factors.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_SYNTA=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\huffman.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\pulse.h"\
-	".\rvlc_scale_factors.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_SYNTA=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\cfft.h"\
-	".\codebook\hcb.h"\
-	".\common.h"\
-	".\data.h"\
-	".\decoder.h"\
-	".\filtbank.h"\
-	".\fixed.h"\
-	".\huffman.h"\
-	".\ic_predict.h"\
-	".\mdct.h"\
-	".\pulse.h"\
-	".\rvlc_scale_factors.h"\
-	".\specrec.h"\
-	".\syntax.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\tns.c
-
-!IF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Release"
-
-DEP_CPP_TNS_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE ARM) Debug"
-
-DEP_CPP_TNS_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Release"
-
-DEP_CPP_TNS_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ELSEIF  "$(CFG)" == "libfaad2 - Win32 (WCE x86) Debug"
-
-DEP_CPP_TNS_C=\
-	".\analysis.h"\
-	".\bits.h"\
-	".\common.h"\
-	".\fixed.h"\
-	".\syntax.h"\
-	".\tns.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\analysis.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\bits.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfft.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfft_tab.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\data.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dither.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\drc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\error.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\filtbank.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\fixed.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\huffman.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ic_predict.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\iq_table.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\is.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\kbd_win.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\lt_predict.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mdct.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ms.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\output.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pns.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pulse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rvlc_scale_factors.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\sine_win.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\specrec.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\syntax.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\tns.h
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/libfaad/libfaad2.vcw
+++ /dev/null
@@ -1,29 +1,0 @@
-Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libfaad2"=".\libfaad2.vcp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/libfaad/libfaad2_dll.dsp
+++ /dev/null
@@ -1,359 +1,0 @@
-# Microsoft Developer Studio Project File - Name="libfaad2_dll" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=libfaad2_dll - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libfaad2_dll.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libfaad2_dll.mak" CFG="libfaad2_dll - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libfaad2_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "libfaad2_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libfaad2_dll - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "libfaad2_dll___Win32_Release"
-# PROP BASE Intermediate_Dir "libfaad2_dll___Win32_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseDLL"
-# PROP Intermediate_Dir "ReleaseDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libfaad2_dll_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "fftw" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libfaad2_dll_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /nologo /dll /machine:I386
-# ADD LINK32 /nologo /dll /machine:I386 /out:"ReleaseDLL/libfaad2.dll"
-
-!ELSEIF  "$(CFG)" == "libfaad2_dll - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "libfaad2_dll___Win32_Debug"
-# PROP BASE Intermediate_Dir "libfaad2_dll___Win32_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugDLL"
-# PROP Intermediate_Dir "DebugDLL"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libfaad2_dll_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "fftw" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libfaad2_dll_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "_DEBUG"
-# ADD RSC /l 0x407 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /dll /debug /machine:I386 /out:"DebugDLL/libfaad2.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libfaad2_dll - Win32 Release"
-# Name "libfaad2_dll - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\bits.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfft.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\common.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\decoder.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\drc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\error.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\filtbank.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\hcr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\huffman.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ic_predict.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\is.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\lt_predict.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mdct.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ms.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\output.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pns.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ps_dec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ps_syntax.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\pulse.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rvlc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_dct.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_dec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_e_nf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_fbt.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_hfadj.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_hfgen.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_huff.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_qmf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_syntax.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\sbr_tf_grid.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\specrec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssr_fb.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssr_ipqf.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\syntax.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\tns.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\analysis.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\bits.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\cfft.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\common.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\data.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\dither.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\drc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\error.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\filtbank.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\codebook\hcb.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\huffman.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ic_predict.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\is.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\kbd_win.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\lt_predict.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mdct.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mp4.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ms.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\output.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pns.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\pulse.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\rvlc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\specrec.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\ssr.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\syntax.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\Tns.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=.\libfaad2.def
-# End Source File
-# End Target
-# End Project
--- a/libfaad/libfaad2_dll.dsw
+++ /dev/null
@@ -1,29 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libfaad2_dll"=.\libfaad2_dll.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/plugins/QCD/QCDFAAD.dsp
+++ /dev/null
@@ -1,152 +1,0 @@
-# Microsoft Developer Studio Project File - Name="QCDFAAD" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=QCDFAAD - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "QCDFAAD.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "QCDFAAD.mak" CFG="QCDFAAD - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "QCDFAAD - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "QCDFAAD - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "QCDFAAD - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\include" /I "..\..\common\faad" /I "..\..\plugins\winamp" /I "..\..\common\id3lib\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ID3LIB_COMPILATION" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /nologo /subsystem:windows /dll /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:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "QCDFAAD - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\common\faad" /I "..\..\plugins\winamp" /I "..\..\common\id3lib\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ID3LIB_COMPILATION" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /nologo /subsystem:windows /dll /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:windows /dll /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /force
-
-!ENDIF 
-
-# Begin Target
-
-# Name "QCDFAAD - Win32 Release"
-# Name "QCDFAAD - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\..\common\faad\aacinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\faad\filestream.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDFAAD.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\common\faad\aacinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\faad.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\faad\filestream.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDInputDLL.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDModDefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDModInput.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\hand.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\logo.bmp
-# End Source File
-# Begin Source File
-
-SOURCE=.\plugin_dlg.rc
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/plugins/QCD/QCDFAAD.dsw
+++ /dev/null
@@ -1,44 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "QCDFAAD"=".\QCDFAAD.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libfaad
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libfaad"="..\..\libfaad\libfaad.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- /dev/null
+++ b/plugins/QCD/QCDFAAD.sln
@@ -1,0 +1,29 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QCDFAAD", "QCDFAAD.vcproj", "{71955EB0-4F77-462B-A844-2BA56E74B87E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114} = {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "..\..\libfaad\libfaad.vcproj", "{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{71955EB0-4F77-462B-A844-2BA56E74B87E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{71955EB0-4F77-462B-A844-2BA56E74B87E}.Debug|Win32.Build.0 = Debug|Win32
+		{71955EB0-4F77-462B-A844-2BA56E74B87E}.Release|Win32.ActiveCfg = Release|Win32
+		{71955EB0-4F77-462B-A844-2BA56E74B87E}.Release|Win32.Build.0 = Release|Win32
+		{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|Win32.Build.0 = Debug|Win32
+		{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|Win32.ActiveCfg = Release|Win32
+		{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- /dev/null
+++ b/plugins/QCD/QCDFAAD.vcproj
@@ -1,0 +1,348 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="QCDFAAD"
+	ProjectGUID="{71955EB0-4F77-462B-A844-2BA56E74B87E}"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/QCDFAAD.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include,..\..\common\faad,..\..\plugins\winamp,..\..\common\id3lib\include"
+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;ID3LIB_COMPILATION"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				PrecompiledHeaderFile=".\Debug/QCDFAAD.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1043"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
+				OutputFile=".\Debug/QCDFAAD.dll"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\Debug/QCDFAAD.pdb"
+				SubSystem="2"
+				ImportLibrary=".\Debug/QCDFAAD.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Debug/QCDFAAD.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/QCDFAAD.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\include,..\..\common\faad,..\..\plugins\winamp,..\..\common\id3lib\include"
+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;ID3LIB_COMPILATION"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				PrecompiledHeaderFile=".\Release/QCDFAAD.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1043"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
+				OutputFile=".\Release/QCDFAAD.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release/QCDFAAD.pdb"
+				SubSystem="2"
+				ImportLibrary=".\Release/QCDFAAD.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release/QCDFAAD.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\common\faad\aacinfo.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\common\faad\filestream.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="QCDFAAD.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\common\faad\aacinfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\include\faad.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\faad\filestream.h"
+				>
+			</File>
+			<File
+				RelativePath="QCDInputDLL.h"
+				>
+			</File>
+			<File
+				RelativePath="QCDModDefs.h"
+				>
+			</File>
+			<File
+				RelativePath="QCDModInput.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+			<File
+				RelativePath="hand.cur"
+				>
+			</File>
+			<File
+				RelativePath="logo.bmp"
+				>
+			</File>
+			<File
+				RelativePath="plugin_dlg.rc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/plugins/QCDMp4/QCDMp4.dsp
+++ /dev/null
@@ -1,167 +1,0 @@
-# Microsoft Developer Studio Project File - Name="QCDMp4" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=QCDMp4 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "QCDMp4.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "QCDMp4.mak" CFG="QCDMp4 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "QCDMp4 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "QCDMp4 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "QCDMp4 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\..\include" /I "..\..\common\mp4v2" /I "..\..\common\mp4av" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.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 /nologo /subsystem:windows /dll /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:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "QCDMp4 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\common\mp4v2" /I "..\..\common\mp4av" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.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 /nologo /subsystem:windows /dll /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:windows /dll /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "QCDMp4 - Win32 Release"
-# Name "QCDMp4 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\aac2mp4.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\aacinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\config.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDMp4.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDMp4Tag.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\utils.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\aacinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\faad.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDInputDLL.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDModInput.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDTagsDLL.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDModTagEditor.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\QCDModDefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\utils.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\QCDMp4.rc
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/plugins/QCDMp4/QCDMp4.dsw
+++ /dev/null
@@ -1,74 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "QCDMp4"=.\QCDMp4.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libfaad
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libmp4v2_st
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name libmp4av_st
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libfaad"=..\..\libfaad\libfaad.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libmp4av_st"=..\..\common\mp4av\libmp4av_st.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "libmp4v2_st"=..\..\common\mp4v2\libmp4v2_st60.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/plugins/QCDMp4/QCDMp4.sln
+++ b/plugins/QCDMp4/QCDMp4.sln
@@ -1,48 +1,35 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QCDMp4", "QCDMp4.vcproj", "{2D8F479D-A591-4502-9456-398425D5F834}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46} = {2398BB2F-FFF9-490B-B4CC-863F2D21AE46}
 		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49} = {8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}
-		{82CAD808-21AF-40A6-92EC-AE01AA67B413} = {82CAD808-21AF-40A6-92EC-AE01AA67B413}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "..\..\libfaad\libfaad.vcproj", "{82CAD808-21AF-40A6-92EC-AE01AA67B413}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "..\..\libfaad\libfaad.vcproj", "{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp4v2_st", "..\..\common\mp4v2\libmp4v2_st60.vcproj", "{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp4av_st", "..\..\common\mp4av\libmp4av_st.vcproj", "{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{2D8F479D-A591-4502-9456-398425D5F834}.Debug.ActiveCfg = Debug|Win32
-		{2D8F479D-A591-4502-9456-398425D5F834}.Debug.Build.0 = Debug|Win32
-		{2D8F479D-A591-4502-9456-398425D5F834}.Release.ActiveCfg = Release|Win32
-		{2D8F479D-A591-4502-9456-398425D5F834}.Release.Build.0 = Release|Win32
-		{82CAD808-21AF-40A6-92EC-AE01AA67B413}.Debug.ActiveCfg = Debug|Win32
-		{82CAD808-21AF-40A6-92EC-AE01AA67B413}.Debug.Build.0 = Debug|Win32
-		{82CAD808-21AF-40A6-92EC-AE01AA67B413}.Release.ActiveCfg = Release|Win32
-		{82CAD808-21AF-40A6-92EC-AE01AA67B413}.Release.Build.0 = Release|Win32
-		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Debug.ActiveCfg = Debug|Win32
-		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Debug.Build.0 = Debug|Win32
-		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Release.ActiveCfg = Release|Win32
-		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Release.Build.0 = Release|Win32
-		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Debug.ActiveCfg = Debug|Win32
-		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Debug.Build.0 = Debug|Win32
-		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Release.ActiveCfg = Release|Win32
-		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Release.Build.0 = Release|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2D8F479D-A591-4502-9456-398425D5F834}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2D8F479D-A591-4502-9456-398425D5F834}.Debug|Win32.Build.0 = Debug|Win32
+		{2D8F479D-A591-4502-9456-398425D5F834}.Release|Win32.ActiveCfg = Release|Win32
+		{2D8F479D-A591-4502-9456-398425D5F834}.Release|Win32.Build.0 = Release|Win32
+		{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|Win32.ActiveCfg = Release|Win32
+		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Release|Win32.ActiveCfg = Release|Win32
+		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Release|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
--- a/plugins/QCDMp4/QCDMp4.vcproj
+++ b/plugins/QCDMp4/QCDMp4.vcproj
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="QCDMp4"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{2D8F479D-A591-4502-9456-398425D5F834}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
@@ -15,9 +18,31 @@
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/QCDMp4.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include,..\..\common\mp4v2,..\..\common\mp4av"
@@ -24,55 +49,63 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug/QCDMp4.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1043"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\Debug/QCDMp4.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/QCDMp4.pdb"
 				SubSystem="2"
-				ImportLibrary=".\Debug/QCDMp4.lib"/>
+				ImportLibrary=".\Debug/QCDMp4.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/QCDMp4.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1043"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
@@ -79,69 +112,97 @@
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/QCDMp4.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
-				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="TRUE"
+				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="..\..\include,..\..\common\mp4v2,..\..\common\mp4av"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/QCDMp4.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1043"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib"
 				OutputFile=".\Release/QCDMp4.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames=""
 				ProgramDatabaseFile=".\Release/QCDMp4.pdb"
 				SubSystem="2"
-				ImportLibrary=".\Release/QCDMp4.lib"/>
+				ImportLibrary=".\Release/QCDMp4.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/QCDMp4.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1043"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -149,56 +210,73 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\config.c">
+				RelativePath=".\config.c"
+				>
 			</File>
 			<File
-				RelativePath=".\QCDMp4.c">
+				RelativePath=".\QCDMp4.c"
+				>
 			</File>
 			<File
-				RelativePath=".\QCDMp4Tag.cpp">
+				RelativePath=".\QCDMp4Tag.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\utils.c">
+				RelativePath=".\utils.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\config.h">
+				RelativePath=".\config.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\include\faad.h">
+				RelativePath="..\..\include\faad.h"
+				>
 			</File>
 			<File
-				RelativePath=".\QCDInputDLL.h">
+				RelativePath=".\QCDInputDLL.h"
+				>
 			</File>
 			<File
-				RelativePath=".\QCDModDefs.h">
+				RelativePath=".\QCDModDefs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\QCDModInput.h">
+				RelativePath=".\QCDModInput.h"
+				>
 			</File>
 			<File
-				RelativePath=".\QCDModTagEditor.h">
+				RelativePath=".\QCDModTagEditor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\QCDTagsDLL.h">
+				RelativePath=".\QCDTagsDLL.h"
+				>
 			</File>
 			<File
-				RelativePath="resource.h">
+				RelativePath="resource.h"
+				>
 			</File>
 			<File
-				RelativePath=".\utils.h">
+				RelativePath=".\utils.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 			<File
-				RelativePath=".\QCDMp4.rc">
+				RelativePath=".\QCDMp4.rc"
+				>
 			</File>
 		</Filter>
 	</Files>
--- a/plugins/in_mp4/in_mp4.dsp
+++ /dev/null
@@ -1,155 +1,0 @@
-# Microsoft Developer Studio Project File - Name="in_mp4" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=in_mp4 - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "in_mp4.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "in_mp4.mak" CFG="in_mp4 - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "in_mp4 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "in_mp4 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=xicl6.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "in_mp4 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\..\include" /I "..\..\common\mp4v2" /I "..\..\common\mp4av" /I "..\..\common\mp4ff" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x413 /d "NDEBUG"
-# ADD RSC /l 0x413 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.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 /nologo /subsystem:windows /dll /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:windows /dll /machine:I386
-
-!ELSEIF  "$(CFG)" == "in_mp4 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\common\mp4v2" /I "..\..\common\mp4av" /I "..\..\common\mp4ff" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x413 /d "_DEBUG"
-# ADD RSC /l 0x413 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=xilink6.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 /nologo /subsystem:windows /dll /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:windows /dll /debug /machine:I386 /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "in_mp4 - Win32 Release"
-# Name "in_mp4 - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\aacinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\config.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\in_mp4.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\utils.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\aacinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\in2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\mp4ff\mp4ff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\common\mp4ff\mp4ff_int_types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\neaacdec.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\out.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\utils.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\in_mp4.rc
-# End Source File
-# End Group
-# End Target
-# End Project
--- a/plugins/in_mp4/in_mp4.dsw
+++ /dev/null
@@ -1,59 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "in_mp4"=.\in_mp4.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libfaad
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name mp4ff
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libfaad"=..\..\libfaad\libfaad.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "mp4ff"=..\..\common\mp4ff\mp4ff.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
--- a/plugins/in_mp4/in_mp4.sln
+++ b/plugins/in_mp4/in_mp4.sln
@@ -1,48 +1,33 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "in_mp4", "in_mp4.vcproj", "{2D8F479D-A591-4502-9456-398425D5F834}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46} = {2398BB2F-FFF9-490B-B4CC-863F2D21AE46}
 		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49} = {8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}
-		{82CAD808-21AF-40A6-92EC-AE01AA67B413} = {82CAD808-21AF-40A6-92EC-AE01AA67B413}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "..\..\libfaad\libfaad.vcproj", "{82CAD808-21AF-40A6-92EC-AE01AA67B413}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "..\..\libfaad\libfaad.vcproj", "{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp4v2_st", "..\..\common\mp4v2\libmp4v2_st60.vcproj", "{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmp4av_st", "..\..\common\mp4av\libmp4av_st.vcproj", "{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{2D8F479D-A591-4502-9456-398425D5F834}.Debug.ActiveCfg = Debug|Win32
-		{2D8F479D-A591-4502-9456-398425D5F834}.Debug.Build.0 = Debug|Win32
-		{2D8F479D-A591-4502-9456-398425D5F834}.Release.ActiveCfg = Release|Win32
-		{2D8F479D-A591-4502-9456-398425D5F834}.Release.Build.0 = Release|Win32
-		{82CAD808-21AF-40A6-92EC-AE01AA67B413}.Debug.ActiveCfg = Debug|Win32
-		{82CAD808-21AF-40A6-92EC-AE01AA67B413}.Debug.Build.0 = Debug|Win32
-		{82CAD808-21AF-40A6-92EC-AE01AA67B413}.Release.ActiveCfg = Release|Win32
-		{82CAD808-21AF-40A6-92EC-AE01AA67B413}.Release.Build.0 = Release|Win32
-		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Debug.ActiveCfg = Debug|Win32
-		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Debug.Build.0 = Debug|Win32
-		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Release.ActiveCfg = Release|Win32
-		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Release.Build.0 = Release|Win32
-		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Debug.ActiveCfg = Debug|Win32
-		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Debug.Build.0 = Debug|Win32
-		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Release.ActiveCfg = Release|Win32
-		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Release.Build.0 = Release|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2D8F479D-A591-4502-9456-398425D5F834}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2D8F479D-A591-4502-9456-398425D5F834}.Release|Win32.ActiveCfg = Release|Win32
+		{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|Win32.ActiveCfg = Release|Win32
+		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2398BB2F-FFF9-490B-B4CC-863F2D21AE46}.Release|Win32.ActiveCfg = Release|Win32
+		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8CAC9E26-BAA5-45A4-8721-E3170B3F8F49}.Release|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
--- a/plugins/mpeg4ip/faad2_plugin.dsp
+++ /dev/null
@@ -1,107 +1,0 @@
-# Microsoft Developer Studio Project File - Name="faad2_plugin" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=faad2_plugin - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "faad2_plugin.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "faad2_plugin.mak" CFG="faad2_plugin - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "faad2_plugin - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "faad2_plugin - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "faad2_plugin - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../include" /I "/mpeg4ip/include" /I "/mpeg4ip/player/src" /I "/mpeg4ip/player/lib/mp4util" /I "/mpeg4ip/lib/sdp" /I "/mpeg4ip/lib/SDL/include" /I "/mpeg4ip/lib/mp4v2" /D "_WINDOWS" /D "_WIN32" /D "WIN32" /D "NDEBUG" /YX /FD /I /mpeg4ip/include" /I /mpeg4ip/player/src" /I /mpeg4ip/lib/sdp" /I /mpeg4ip/player/lib/mp4util" /I /mpeg4ip/lib/SDL/include" " " " " " /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /nologo /subsystem:windows /dll /machine:I386
-# ADD 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 \mpeg4ip\player\lib\mp4util\Release\libmp4util60.lib \mpeg4ip\lib\bitstream\Release\bitstream60.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"libcmt.lib" /nodefaultlib:"libc.lib"
-
-!ELSEIF  "$(CFG)" == "faad2_plugin - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "/mpeg4ip/include" /I "/mpeg4ip/player/src" /I "/mpeg4ip/player/lib/mp4util" /I "/mpeg4ip/lib/sdp" /I "/mpeg4ip/lib/SDL/include" /I "/mpeg4ip/lib/mp4v2" /D "_WINDOWS" /D "_WIN32" /D "WIN32" /D "_DEBUG" /YX /FD /I /mpeg4ip/lib/mp4v2" /I /mpeg4ip/lib/SDL" /I /mpeg4ip/include" /I /mpeg4ip/player/src" /I /mpeg4ip/lib/sdp" /I /mpeg4ip/player/lib/mp4util" /I /mpeg4ip/lib/SDL/include" " " " " " " " /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD 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 \mpeg4ip\player\lib\mp4util\Debug\libmp4util60.lib \mpeg4ip\lib\bitstream\Debug\bitstream60.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libcd.lib" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "faad2_plugin - Win32 Release"
-# Name "faad2_plugin - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\aa_file.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\aa_file.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\faad2.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\faad2.h
-# End Source File
-# End Target
-# End Project
--- a/plugins/mpeg4ip/faad2_plugin.dsw
+++ /dev/null
@@ -1,44 +1,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "faad2_plugin"=.\faad2_plugin.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name libfaad
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "libfaad"=..\..\libfaad\libfaad.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-