Index: /dsfilters/dec_mpc/dec_mpc.sln
===================================================================
--- /dsfilters/dec_mpc/dec_mpc.sln	(revision 380)
+++ /dsfilters/dec_mpc/dec_mpc.sln	(revision 381)
@@ -7,11 +7,17 @@
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug-MFCStatic|Win32 = Debug-MFCStatic|Win32
 		Release|Win32 = Release|Win32
+		Release-MFCStatic|Win32 = Release-MFCStatic|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D9BE0605-05BF-44FA-B17F-6C501DD7E770}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D9BE0605-05BF-44FA-B17F-6C501DD7E770}.Debug|Win32.Build.0 = Debug|Win32
+		{D9BE0605-05BF-44FA-B17F-6C501DD7E770}.Debug-MFCStatic|Win32.ActiveCfg = Debug-MFCStatic|Win32
+		{D9BE0605-05BF-44FA-B17F-6C501DD7E770}.Debug-MFCStatic|Win32.Build.0 = Debug-MFCStatic|Win32
 		{D9BE0605-05BF-44FA-B17F-6C501DD7E770}.Release|Win32.ActiveCfg = Release|Win32
 		{D9BE0605-05BF-44FA-B17F-6C501DD7E770}.Release|Win32.Build.0 = Release|Win32
+		{D9BE0605-05BF-44FA-B17F-6C501DD7E770}.Release-MFCStatic|Win32.ActiveCfg = Release-MFCStatic|Win32
+		{D9BE0605-05BF-44FA-B17F-6C501DD7E770}.Release-MFCStatic|Win32.Build.0 = Release-MFCStatic|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
Index: /dsfilters/dec_mpc/dec_mpc.vcproj
===================================================================
--- /dsfilters/dec_mpc/dec_mpc.vcproj	(revision 380)
+++ /dsfilters/dec_mpc/dec_mpc.vcproj	(revision 381)
@@ -69,5 +69,5 @@
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				EntryPointSymbol="FilterDllMain"
+				EntryPointSymbol="MPCFilterDllMain"
 				TargetMachine="1"
 			/>
@@ -151,5 +151,168 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				EntryPointSymbol="FilterDllMain"
+				EntryPointSymbol="MPCFilterDllMain"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-MFCStatic|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\src;..\..\libmpc\trunk\include;..\..\libmpc\trunk\libmpcdec"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DEC_MPC_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="strmbasdus.lib strmiids.lib winmm.lib ..\lib\libmpcdec_ds.lib ..\lib\libcommon_ds.lib"
+				OutputFile=".\bin\mmmpcdecd.ax"
+				LinkIncremental="2"
+				ModuleDefinitionFile="dec_mpc.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				EntryPointSymbol="MPCFilterDllMain"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-MFCStatic|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".\src;..\..\libmpc\trunk\include;..\..\libmpc\trunk\libmpcdec"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DEC_MPC_EXPORTS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="strmbaseus.lib strmiids.lib winmm.lib ..\lib\libmpcdecs.lib ..\lib\libcommons.lib"
+				OutputFile=".\bin\mmmpcdec.ax"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames=""
+				ModuleDefinitionFile="dec_mpc.def"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="MPCFilterDllMain"
 				TargetMachine="1"
 			/>
Index: /dsfilters/dec_mpc/src/mpc_reg.cpp
===================================================================
--- /dsfilters/dec_mpc/src/mpc_reg.cpp	(revision 380)
+++ /dsfilters/dec_mpc/src/mpc_reg.cpp	(revision 381)
@@ -102,5 +102,5 @@
 
 // The one and only application object
-CWinApp theApp;
+//CWinApp theApp;
 using namespace std;
 
@@ -109,5 +109,5 @@
 extern "C" BOOL WINAPI DllEntryPoint(HINSTANCE, ULONG, LPVOID);
 
-BOOL APIENTRY FilterDllMain(HANDLE hModule, DWORD  dwReason, LPVOID lpReserved)
+BOOL APIENTRY MPCFilterDllMain(HANDLE hModule, DWORD  dwReason, LPVOID lpReserved)
 {
 	_DllMainCRTStartup((HINSTANCE)hModule, dwReason, lpReserved);
Index: /dsfilters/demux_mpc/demux_mpc.sln
===================================================================
--- /dsfilters/demux_mpc/demux_mpc.sln	(revision 380)
+++ /dsfilters/demux_mpc/demux_mpc.sln	(revision 381)
@@ -7,11 +7,17 @@
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug-MFCStatic|Win32 = Debug-MFCStatic|Win32
 		Release|Win32 = Release|Win32
+		Release-MFCStatic|Win32 = Release-MFCStatic|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{17662646-020C-4374-AB81-BA2434AD8260}.Debug|Win32.ActiveCfg = Debug|Win32
 		{17662646-020C-4374-AB81-BA2434AD8260}.Debug|Win32.Build.0 = Debug|Win32
+		{17662646-020C-4374-AB81-BA2434AD8260}.Debug-MFCStatic|Win32.ActiveCfg = Debug-MFCStatic|Win32
+		{17662646-020C-4374-AB81-BA2434AD8260}.Debug-MFCStatic|Win32.Build.0 = Debug-MFCStatic|Win32
 		{17662646-020C-4374-AB81-BA2434AD8260}.Release|Win32.ActiveCfg = Release|Win32
 		{17662646-020C-4374-AB81-BA2434AD8260}.Release|Win32.Build.0 = Release|Win32
+		{17662646-020C-4374-AB81-BA2434AD8260}.Release-MFCStatic|Win32.ActiveCfg = Release-MFCStatic|Win32
+		{17662646-020C-4374-AB81-BA2434AD8260}.Release-MFCStatic|Win32.Build.0 = Release-MFCStatic|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
Index: /dsfilters/demux_mpc/demux_mpc.vcproj
===================================================================
--- /dsfilters/demux_mpc/demux_mpc.vcproj	(revision 380)
+++ /dsfilters/demux_mpc/demux_mpc.vcproj	(revision 381)
@@ -69,5 +69,5 @@
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				EntryPointSymbol="FilterDllMain"
+				EntryPointSymbol="MPCFilterDllMain"
 				TargetMachine="1"
 			/>
@@ -150,5 +150,167 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				EntryPointSymbol="FilterDllMain"
+				EntryPointSymbol="MPCFilterDllMain"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug-MFCStatic|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".\src"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DEMUX_MPC_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="strmbasdus.lib strmiids.lib winmm.lib"
+				OutputFile=".\bin\mmmpcdmxd.ax"
+				LinkIncremental="2"
+				ModuleDefinitionFile="demux_mpc.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				EntryPointSymbol="MPCFilterDllMain"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release-MFCStatic|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			UseOfMFC="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".\src"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;DEMUX_MPC_EXPORTS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="strmbaseus.lib strmiids.lib winmm.lib"
+				OutputFile=".\bin\mmmpcdmx.ax"
+				LinkIncremental="1"
+				ModuleDefinitionFile="demux_mpc.def"
+				GenerateDebugInformation="false"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol="MPCFilterDllMain"
 				TargetMachine="1"
 			/>
Index: /dsfilters/demux_mpc/src/mpc_reg.cpp
===================================================================
--- /dsfilters/demux_mpc/src/mpc_reg.cpp	(revision 380)
+++ /dsfilters/demux_mpc/src/mpc_reg.cpp	(revision 381)
@@ -7,4 +7,5 @@
 //-----------------------------------------------------------------------------
 #include "stdafx.h"
+#include <atlbase.h>
 
 #pragma warning(disable: 4996)
@@ -138,5 +139,5 @@
 
 // The one and only application object
-CWinApp theApp;
+//CWinApp theApp;
 using namespace std;
 
@@ -145,5 +146,5 @@
 extern "C" BOOL WINAPI DllEntryPoint(HINSTANCE, ULONG, LPVOID);
 
-BOOL APIENTRY FilterDllMain(HANDLE hModule, DWORD  dwReason, LPVOID lpReserved)
+BOOL APIENTRY MPCFilterDllMain(HANDLE hModule, DWORD  dwReason, LPVOID lpReserved)
 {
 	_DllMainCRTStartup((HINSTANCE)hModule, dwReason, lpReserved);