Index: /dsfilters/dec_mpc/dec_mpc.rc
===================================================================
--- /dsfilters/dec_mpc/dec_mpc.rc	(revision 437)
+++ /dsfilters/dec_mpc/dec_mpc.rc	(revision 438)
@@ -61,6 +61,6 @@
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,2,0
- PRODUCTVERSION 0,9,2,0
+ FILEVERSION 0,9,3,0
+ PRODUCTVERSION 0,9,3,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -79,10 +79,10 @@
             VALUE "Comments", "Musepack SV8 Decoder"
             VALUE "FileDescription", "mmmpcdec"
-            VALUE "FileVersion", "0, 9, 2, 0"
+            VALUE "FileVersion", "0, 9, 3, 0"
             VALUE "InternalName", "mmmpcdec"
             VALUE "LegalCopyright", "Copyright (C) 2009"
             VALUE "OriginalFilename", "mmmpcdec.ax"
             VALUE "ProductName", "MONOGRAM Musepack Decoder"
-            VALUE "ProductVersion", "0, 9, 2, 0"
+            VALUE "ProductVersion", "0, 9, 3, 0"
         END
     END
@@ -147,5 +147,5 @@
     LTEXT           "0.000 kbps",IDC_STATIC_BITRATE,78,126,60,8
     CTEXT           "MONOGRAM Musepack Decoder",IDC_STATIC,162,36,108,8
-    CTEXT           "0.9.2.0",IDC_STATIC,162,48,108,8
+    CTEXT           "0.9.3.0",IDC_STATIC,162,48,108,8
 END
 
Index: /dsfilters/dec_mpc/dec_mpc.sln
===================================================================
--- /dsfilters/dec_mpc/dec_mpc.sln	(revision 437)
+++ /dsfilters/dec_mpc/dec_mpc.sln	(revision 438)
@@ -6,16 +6,10 @@
 Global
 	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
Index: /dsfilters/dec_mpc/dec_mpc.vcproj
===================================================================
--- /dsfilters/dec_mpc/dec_mpc.vcproj	(revision 437)
+++ /dsfilters/dec_mpc/dec_mpc.vcproj	(revision 438)
@@ -17,167 +17,4 @@
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="2"
-			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="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="strmbasdu.lib strmiids.lib winmm.lib ..\lib\libmpcdec_d.lib ..\lib\libcommon_d.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|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="2"
-			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="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="strmbaseu.lib strmiids.lib winmm.lib ..\lib\libmpcdec.lib ..\lib\libcommon.lib"
-				OutputFile=".\bin\mmmpcdec.ax"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames=""
-				ModuleDefinitionFile="dec_mpc.def"
-				GenerateDebugInformation="false"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="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="Debug-MFCStatic|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
Index: /dsfilters/dec_mpc/src/mpc_filter.cpp
===================================================================
--- /dsfilters/dec_mpc/src/mpc_filter.cpp	(revision 437)
+++ /dsfilters/dec_mpc/src/mpc_filter.cpp	(revision 438)
@@ -330,6 +330,6 @@
 	// discontinuity after seek - reset scale factors
 	if (pSample->IsDiscontinuity() == NOERROR) {
-		memset(demux->d->SCF_Index_L, 0, sizeof(demux->d->SCF_Index_L));
-		memset(demux->d->SCF_Index_R, 0, sizeof(demux->d->SCF_Index_R));
+		memset(demux->d->SCF_Index_L, 1, sizeof(demux->d->SCF_Index_L));
+		memset(demux->d->SCF_Index_R, 1, sizeof(demux->d->SCF_Index_R));
 	}
 
Index: /dsfilters/demux_mpc/demux_mpc.rc
===================================================================
--- /dsfilters/demux_mpc/demux_mpc.rc	(revision 437)
+++ /dsfilters/demux_mpc/demux_mpc.rc	(revision 438)
@@ -61,6 +61,6 @@
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,4,0,0
- PRODUCTVERSION 0,4,0,0
+ FILEVERSION 0,4,1,0
+ PRODUCTVERSION 0,4,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -79,10 +79,10 @@
             VALUE "Comments", "Musepack Splitter"
             VALUE "FileDescription", "mmmpcdmx"
-            VALUE "FileVersion", "0, 4, 0, 0"
+            VALUE "FileVersion", "0, 4, 1, 0"
             VALUE "InternalName", "MONOGRAM Musepack Splitter"
-            VALUE "LegalCopyright", "Copyright (C) 2007"
+            VALUE "LegalCopyright", "Copyright (C) 2009"
             VALUE "OriginalFilename", "mmmpcdmx.ax"
             VALUE "ProductName", "MONOGRAM Musepack Splitter"
-            VALUE "ProductVersion", "0, 4, 0, 0"
+            VALUE "ProductVersion", "0, 4, 1, 0"
         END
     END
@@ -133,5 +133,5 @@
     CONTROL         101,IDC_STATIC,"Static",SS_BITMAP,0,0,280,30
     CTEXT           "MONOGRAM Musepack Splitter",IDC_STATIC,162,36,108,8
-    CTEXT           "0.4.0.0",IDC_STATIC,162,48,108,8
+    CTEXT           "0.4.1.0",IDC_STATIC,162,48,108,8
 END
 
Index: /dsfilters/demux_mpc/demux_mpc.sln
===================================================================
--- /dsfilters/demux_mpc/demux_mpc.sln	(revision 437)
+++ /dsfilters/demux_mpc/demux_mpc.sln	(revision 438)
@@ -6,16 +6,10 @@
 Global
 	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
Index: /dsfilters/demux_mpc/demux_mpc.vcproj
===================================================================
--- /dsfilters/demux_mpc/demux_mpc.vcproj	(revision 437)
+++ /dsfilters/demux_mpc/demux_mpc.vcproj	(revision 438)
@@ -17,166 +17,4 @@
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="2"
-			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="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="strmbasdu.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|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="2"
-			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="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="strmbaseu.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"
-			/>
-			<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)"
Index: /dsfilters/demux_mpc/src/mpc_pin.cpp
===================================================================
--- /dsfilters/demux_mpc/src/mpc_pin.cpp	(revision 437)
+++ /dsfilters/demux_mpc/src/mpc_pin.cpp	(revision 438)
@@ -277,9 +277,6 @@
 	eos_delivered = false;
 
-
 	if (1) {
 		return DeliverNewSegment(rtStart, rtStop, rate);
-		discontinuity = true;
-
 	} else {
 		DataPacket	*packet = new DataPacket();
@@ -292,5 +289,4 @@
 			queue.AddTail(packet);
 			ev_can_read.Set();
-			discontinuity = true;
 		}
 	}
@@ -369,12 +365,4 @@
 	outp->sync_point = TRUE;
 
-	// discontinuity ?
-	if (discontinuity) {
-		outp->discontinuity = TRUE;
-		discontinuity = false;
-	} else {
-		outp->discontinuity = FALSE;
-	}
-
 	{
 		// insert into queue
@@ -445,5 +433,10 @@
 	// sync point, discontinuity ?
 	if (packet.sync_point)		{ sample->SetSyncPoint(TRUE);     } else { sample->SetSyncPoint(FALSE);     }
-	if (packet.discontinuity)	{ sample->SetDiscontinuity(TRUE); } else { sample->SetDiscontinuity(FALSE); }
+	if (discontinuity)	{ 
+		discontinuity = false;
+		sample->SetDiscontinuity(TRUE); 
+	} else { 
+		sample->SetDiscontinuity(FALSE); 
+	}
 
 	// do we have a time stamp ?
@@ -516,4 +509,7 @@
 				HRESULT		hr;
 
+				// first packet is a discontinuity
+				discontinuity = true;
+
 				do {
 					if (ev_abort.Check()) break;