Moved MPC-HC subtitle engine under DirectShowFilters

MediaPortal · Mar 20, 2013 · 1e53109 · 1e53109
1 parent 93bcda0
commit 1e53109
Show file tree

Hide file tree

Showing 270 changed files with 134 additions and 351 deletions.
diff --git a/DirectShowFilters/Filters.sln b/DirectShowFilters/Filters.sln
diff --git a/DirectShowFilters/MPAudioswitcher/MPAudioSwitcher.vcxproj b/DirectShowFilters/MPAudioswitcher/MPAudioSwitcher.vcxproj
@@ -54,7 +54,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)baseclasses;..\..\mediaportal\Core.cpp\mpc-hc_subs\src\dsutil;$(DXSDK_DIR)Include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)baseclasses;..\mpc-hc_subs\src\dsutil;$(DXSDK_DIR)Include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>REGISTER_FILTER;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -85,7 +85,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)baseclasses;..\..\mediaportal\Core.cpp\mpc-hc_subs\src\dsutil;$(DXSDK_DIR)Include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)baseclasses;..\mpc-hc_subs\src\dsutil;$(DXSDK_DIR)Include</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>REGISTER_FILTER;WIN32;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AssemblerListingLocation>.\obj\Release/</AssemblerListingLocation>
       <ObjectFileName>.\obj\Release/</ObjectFileName>
@@ -129,21 +129,11 @@
     <ClInclude Include="source\text.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\mediaportal\Core.cpp\mpc-hc_subs\src\dsutil\DSUtil.vcxproj">
+    <ProjectReference Include="..\mpc-hc_subs\src\dsutil\DSUtil.vcxproj">
       <Project>{fc70988b-1ae5-4381-866d-4f405e28ac42}</Project>
-      <Private>false</Private>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
-    <ProjectReference Include="..\..\mediaportal\Core.cpp\mpc-hc_subs\src\thirdparty\VirtualDub\system\system.vcxproj">
+    <ProjectReference Include="..\mpc-hc_subs\src\thirdparty\VirtualDub\system\system.vcxproj">
       <Project>{c2082189-3ecb-4079-91fa-89d3c8a305c0}</Project>
-      <Private>false</Private>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/...Core.cpp/mpc-hc_subs/include/ITrackInfo.h → ...wFilters/mpc-hc_subs/include/ITrackInfo.h b/...Core.cpp/mpc-hc_subs/include/ITrackInfo.h → ...wFilters/mpc-hc_subs/include/ITrackInfo.h
diff --git a/...rtal/Core.cpp/mpc-hc_subs/include/UNRAR.H → ...ctShowFilters/mpc-hc_subs/include/UNRAR.H b/...rtal/Core.cpp/mpc-hc_subs/include/UNRAR.H → ...ctShowFilters/mpc-hc_subs/include/UNRAR.H
diff --git a/.../Core.cpp/mpc-hc_subs/include/moreuuids.h → ...owFilters/mpc-hc_subs/include/moreuuids.h b/.../Core.cpp/mpc-hc_subs/include/moreuuids.h → ...owFilters/mpc-hc_subs/include/moreuuids.h
diff --git a/...cpp/mpc-hc_subs/include/winddk/devioctl.h → ...ers/mpc-hc_subs/include/winddk/devioctl.h b/...cpp/mpc-hc_subs/include/winddk/devioctl.h → ...ers/mpc-hc_subs/include/winddk/devioctl.h
diff --git a/...cpp/mpc-hc_subs/include/winddk/ntddcdrm.h → ...ers/mpc-hc_subs/include/winddk/ntddcdrm.h b/...cpp/mpc-hc_subs/include/winddk/ntddcdrm.h → ...ers/mpc-hc_subs/include/winddk/ntddcdrm.h
diff --git a/...cpp/mpc-hc_subs/include/winddk/ntddcdvd.h → ...ers/mpc-hc_subs/include/winddk/ntddcdvd.h b/...cpp/mpc-hc_subs/include/winddk/ntddcdvd.h → ...ers/mpc-hc_subs/include/winddk/ntddcdvd.h
diff --git a/...cpp/mpc-hc_subs/include/winddk/ntdddisk.h → ...ers/mpc-hc_subs/include/winddk/ntdddisk.h b/...cpp/mpc-hc_subs/include/winddk/ntdddisk.h → ...ers/mpc-hc_subs/include/winddk/ntdddisk.h
diff --git a/...cpp/mpc-hc_subs/include/winddk/ntddstor.h → ...ers/mpc-hc_subs/include/winddk/ntddstor.h b/...cpp/mpc-hc_subs/include/winddk/ntddstor.h → ...ers/mpc-hc_subs/include/winddk/ntddstor.h
diff --git a/mediaportal/Core.cpp/mpc-hc_subs_readme.txt → ...ilters/mpc-hc_subs/mpc-hc_subs_readme.txt b/mediaportal/Core.cpp/mpc-hc_subs_readme.txt → ...ilters/mpc-hc_subs/mpc-hc_subs_readme.txt
diff --git a/...p/mpc-hc_subs/src/BaseClasses/amextra.cpp → ...s/mpc-hc_subs/src/BaseClasses/amextra.cpp b/...p/mpc-hc_subs/src/BaseClasses/amextra.cpp → ...s/mpc-hc_subs/src/BaseClasses/amextra.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/amextra.h → ...ers/mpc-hc_subs/src/BaseClasses/amextra.h b/...cpp/mpc-hc_subs/src/BaseClasses/amextra.h → ...ers/mpc-hc_subs/src/BaseClasses/amextra.h
diff --git a/.../mpc-hc_subs/src/BaseClasses/amfilter.cpp → .../mpc-hc_subs/src/BaseClasses/amfilter.cpp b/.../mpc-hc_subs/src/BaseClasses/amfilter.cpp → .../mpc-hc_subs/src/BaseClasses/amfilter.cpp
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/amfilter.h → ...rs/mpc-hc_subs/src/BaseClasses/amfilter.h b/...pp/mpc-hc_subs/src/BaseClasses/amfilter.h → ...rs/mpc-hc_subs/src/BaseClasses/amfilter.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/amvideo.cpp → ...s/mpc-hc_subs/src/BaseClasses/amvideo.cpp b/...p/mpc-hc_subs/src/BaseClasses/amvideo.cpp → ...s/mpc-hc_subs/src/BaseClasses/amvideo.cpp
diff --git a/...mpc-hc_subs/src/BaseClasses/arithutil.cpp → ...mpc-hc_subs/src/BaseClasses/arithutil.cpp b/...mpc-hc_subs/src/BaseClasses/arithutil.cpp → ...mpc-hc_subs/src/BaseClasses/arithutil.cpp
diff --git a/..._subs/src/BaseClasses/baseclasses.vcxproj → ..._subs/src/BaseClasses/baseclasses.vcxproj b/..._subs/src/BaseClasses/baseclasses.vcxproj → ..._subs/src/BaseClasses/baseclasses.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}</ProjectGuid>
+    <ProjectGuid>{FBAE2965-2BD8-495C-8B8B-BE86E3E370A2}</ProjectGuid>
     <RootNamespace>BaseClasses</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>

diff --git a/...c/BaseClasses/baseclasses.vcxproj.filters → ...c/BaseClasses/baseclasses.vcxproj.filters b/...c/BaseClasses/baseclasses.vcxproj.filters → ...c/BaseClasses/baseclasses.vcxproj.filters
diff --git a/DirectShowFilters/mpc-hc_subs/src/BaseClasses/baseclasses.vcxproj.user b/DirectShowFilters/mpc-hc_subs/src/BaseClasses/baseclasses.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/...e.cpp/mpc-hc_subs/src/BaseClasses/cache.h → ...lters/mpc-hc_subs/src/BaseClasses/cache.h b/...e.cpp/mpc-hc_subs/src/BaseClasses/cache.h → ...lters/mpc-hc_subs/src/BaseClasses/cache.h
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/checkbmi.h → ...rs/mpc-hc_subs/src/BaseClasses/checkbmi.h b/...pp/mpc-hc_subs/src/BaseClasses/checkbmi.h → ...rs/mpc-hc_subs/src/BaseClasses/checkbmi.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/combase.cpp → ...s/mpc-hc_subs/src/BaseClasses/combase.cpp b/...p/mpc-hc_subs/src/BaseClasses/combase.cpp → ...s/mpc-hc_subs/src/BaseClasses/combase.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/combase.h → ...ers/mpc-hc_subs/src/BaseClasses/combase.h b/...cpp/mpc-hc_subs/src/BaseClasses/combase.h → ...ers/mpc-hc_subs/src/BaseClasses/combase.h
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/cprop.cpp → ...ers/mpc-hc_subs/src/BaseClasses/cprop.cpp b/...cpp/mpc-hc_subs/src/BaseClasses/cprop.cpp → ...ers/mpc-hc_subs/src/BaseClasses/cprop.cpp
diff --git a/...e.cpp/mpc-hc_subs/src/BaseClasses/cprop.h → ...lters/mpc-hc_subs/src/BaseClasses/cprop.h b/...e.cpp/mpc-hc_subs/src/BaseClasses/cprop.h → ...lters/mpc-hc_subs/src/BaseClasses/cprop.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/ctlutil.cpp → ...s/mpc-hc_subs/src/BaseClasses/ctlutil.cpp b/...p/mpc-hc_subs/src/BaseClasses/ctlutil.cpp → ...s/mpc-hc_subs/src/BaseClasses/ctlutil.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/ctlutil.h → ...ers/mpc-hc_subs/src/BaseClasses/ctlutil.h b/...cpp/mpc-hc_subs/src/BaseClasses/ctlutil.h → ...ers/mpc-hc_subs/src/BaseClasses/ctlutil.h
diff --git a/....cpp/mpc-hc_subs/src/BaseClasses/ddmm.cpp → ...ters/mpc-hc_subs/src/BaseClasses/ddmm.cpp b/....cpp/mpc-hc_subs/src/BaseClasses/ddmm.cpp → ...ters/mpc-hc_subs/src/BaseClasses/ddmm.cpp
diff --git a/...re.cpp/mpc-hc_subs/src/BaseClasses/ddmm.h → ...ilters/mpc-hc_subs/src/BaseClasses/ddmm.h b/...re.cpp/mpc-hc_subs/src/BaseClasses/ddmm.h → ...ilters/mpc-hc_subs/src/BaseClasses/ddmm.h
diff --git a/.../mpc-hc_subs/src/BaseClasses/dllentry.cpp → .../mpc-hc_subs/src/BaseClasses/dllentry.cpp b/.../mpc-hc_subs/src/BaseClasses/dllentry.cpp → .../mpc-hc_subs/src/BaseClasses/dllentry.cpp
diff --git a/.../mpc-hc_subs/src/BaseClasses/dllsetup.cpp → .../mpc-hc_subs/src/BaseClasses/dllsetup.cpp b/.../mpc-hc_subs/src/BaseClasses/dllsetup.cpp → .../mpc-hc_subs/src/BaseClasses/dllsetup.cpp
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/dllsetup.h → ...rs/mpc-hc_subs/src/BaseClasses/dllsetup.h b/...pp/mpc-hc_subs/src/BaseClasses/dllsetup.h → ...rs/mpc-hc_subs/src/BaseClasses/dllsetup.h
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/dxmperf.h → ...ers/mpc-hc_subs/src/BaseClasses/dxmperf.h b/...cpp/mpc-hc_subs/src/BaseClasses/dxmperf.h → ...ers/mpc-hc_subs/src/BaseClasses/dxmperf.h
diff --git a/....cpp/mpc-hc_subs/src/BaseClasses/fourcc.h → ...ters/mpc-hc_subs/src/BaseClasses/fourcc.h b/....cpp/mpc-hc_subs/src/BaseClasses/fourcc.h → ...ters/mpc-hc_subs/src/BaseClasses/fourcc.h
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/measure.h → ...ers/mpc-hc_subs/src/BaseClasses/measure.h b/...cpp/mpc-hc_subs/src/BaseClasses/measure.h → ...ers/mpc-hc_subs/src/BaseClasses/measure.h
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/msgthrd.h → ...ers/mpc-hc_subs/src/BaseClasses/msgthrd.h b/...cpp/mpc-hc_subs/src/BaseClasses/msgthrd.h → ...ers/mpc-hc_subs/src/BaseClasses/msgthrd.h
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/mtype.cpp → ...ers/mpc-hc_subs/src/BaseClasses/mtype.cpp b/...cpp/mpc-hc_subs/src/BaseClasses/mtype.cpp → ...ers/mpc-hc_subs/src/BaseClasses/mtype.cpp
diff --git a/...e.cpp/mpc-hc_subs/src/BaseClasses/mtype.h → ...lters/mpc-hc_subs/src/BaseClasses/mtype.h b/...e.cpp/mpc-hc_subs/src/BaseClasses/mtype.h → ...lters/mpc-hc_subs/src/BaseClasses/mtype.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/outputq.cpp → ...s/mpc-hc_subs/src/BaseClasses/outputq.cpp b/...p/mpc-hc_subs/src/BaseClasses/outputq.cpp → ...s/mpc-hc_subs/src/BaseClasses/outputq.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/outputq.h → ...ers/mpc-hc_subs/src/BaseClasses/outputq.h b/...cpp/mpc-hc_subs/src/BaseClasses/outputq.h → ...ers/mpc-hc_subs/src/BaseClasses/outputq.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/perflog.cpp → ...s/mpc-hc_subs/src/BaseClasses/perflog.cpp b/...p/mpc-hc_subs/src/BaseClasses/perflog.cpp → ...s/mpc-hc_subs/src/BaseClasses/perflog.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/perflog.h → ...ers/mpc-hc_subs/src/BaseClasses/perflog.h b/...cpp/mpc-hc_subs/src/BaseClasses/perflog.h → ...ers/mpc-hc_subs/src/BaseClasses/perflog.h
diff --git a/.../mpc-hc_subs/src/BaseClasses/perfstruct.h → .../mpc-hc_subs/src/BaseClasses/perfstruct.h b/.../mpc-hc_subs/src/BaseClasses/perfstruct.h → .../mpc-hc_subs/src/BaseClasses/perfstruct.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/pstream.cpp → ...s/mpc-hc_subs/src/BaseClasses/pstream.cpp b/...p/mpc-hc_subs/src/BaseClasses/pstream.cpp → ...s/mpc-hc_subs/src/BaseClasses/pstream.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/pstream.h → ...ers/mpc-hc_subs/src/BaseClasses/pstream.h b/...cpp/mpc-hc_subs/src/BaseClasses/pstream.h → ...ers/mpc-hc_subs/src/BaseClasses/pstream.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/pullpin.cpp → ...s/mpc-hc_subs/src/BaseClasses/pullpin.cpp b/...p/mpc-hc_subs/src/BaseClasses/pullpin.cpp → ...s/mpc-hc_subs/src/BaseClasses/pullpin.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/pullpin.h → ...ers/mpc-hc_subs/src/BaseClasses/pullpin.h b/...cpp/mpc-hc_subs/src/BaseClasses/pullpin.h → ...ers/mpc-hc_subs/src/BaseClasses/pullpin.h
diff --git a/.../mpc-hc_subs/src/BaseClasses/refclock.cpp → .../mpc-hc_subs/src/BaseClasses/refclock.cpp b/.../mpc-hc_subs/src/BaseClasses/refclock.cpp → .../mpc-hc_subs/src/BaseClasses/refclock.cpp
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/refclock.h → ...rs/mpc-hc_subs/src/BaseClasses/refclock.h b/...pp/mpc-hc_subs/src/BaseClasses/refclock.h → ...rs/mpc-hc_subs/src/BaseClasses/refclock.h
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/reftime.h → ...ers/mpc-hc_subs/src/BaseClasses/reftime.h b/...cpp/mpc-hc_subs/src/BaseClasses/reftime.h → ...ers/mpc-hc_subs/src/BaseClasses/reftime.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/renbase.cpp → ...s/mpc-hc_subs/src/BaseClasses/renbase.cpp b/...p/mpc-hc_subs/src/BaseClasses/renbase.cpp → ...s/mpc-hc_subs/src/BaseClasses/renbase.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/renbase.h → ...ers/mpc-hc_subs/src/BaseClasses/renbase.h b/...cpp/mpc-hc_subs/src/BaseClasses/renbase.h → ...ers/mpc-hc_subs/src/BaseClasses/renbase.h
diff --git a/.../mpc-hc_subs/src/BaseClasses/schedule.cpp → .../mpc-hc_subs/src/BaseClasses/schedule.cpp b/.../mpc-hc_subs/src/BaseClasses/schedule.cpp → .../mpc-hc_subs/src/BaseClasses/schedule.cpp
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/schedule.h → ...rs/mpc-hc_subs/src/BaseClasses/schedule.h b/...pp/mpc-hc_subs/src/BaseClasses/schedule.h → ...rs/mpc-hc_subs/src/BaseClasses/schedule.h
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/seekpt.cpp → ...rs/mpc-hc_subs/src/BaseClasses/seekpt.cpp b/...pp/mpc-hc_subs/src/BaseClasses/seekpt.cpp → ...rs/mpc-hc_subs/src/BaseClasses/seekpt.cpp
diff --git a/....cpp/mpc-hc_subs/src/BaseClasses/seekpt.h → ...ters/mpc-hc_subs/src/BaseClasses/seekpt.h b/....cpp/mpc-hc_subs/src/BaseClasses/seekpt.h → ...ters/mpc-hc_subs/src/BaseClasses/seekpt.h
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/source.cpp → ...rs/mpc-hc_subs/src/BaseClasses/source.cpp b/...pp/mpc-hc_subs/src/BaseClasses/source.cpp → ...rs/mpc-hc_subs/src/BaseClasses/source.cpp
diff --git a/....cpp/mpc-hc_subs/src/BaseClasses/source.h → ...ters/mpc-hc_subs/src/BaseClasses/source.h b/....cpp/mpc-hc_subs/src/BaseClasses/source.h → ...ters/mpc-hc_subs/src/BaseClasses/source.h
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/streams.h → ...ers/mpc-hc_subs/src/BaseClasses/streams.h b/...cpp/mpc-hc_subs/src/BaseClasses/streams.h → ...ers/mpc-hc_subs/src/BaseClasses/streams.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/strmctl.cpp → ...s/mpc-hc_subs/src/BaseClasses/strmctl.cpp b/...p/mpc-hc_subs/src/BaseClasses/strmctl.cpp → ...s/mpc-hc_subs/src/BaseClasses/strmctl.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/strmctl.h → ...ers/mpc-hc_subs/src/BaseClasses/strmctl.h b/...cpp/mpc-hc_subs/src/BaseClasses/strmctl.h → ...ers/mpc-hc_subs/src/BaseClasses/strmctl.h
diff --git a/.../mpc-hc_subs/src/BaseClasses/sysclock.cpp → .../mpc-hc_subs/src/BaseClasses/sysclock.cpp b/.../mpc-hc_subs/src/BaseClasses/sysclock.cpp → .../mpc-hc_subs/src/BaseClasses/sysclock.cpp
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/sysclock.h → ...rs/mpc-hc_subs/src/BaseClasses/sysclock.h b/...pp/mpc-hc_subs/src/BaseClasses/sysclock.h → ...rs/mpc-hc_subs/src/BaseClasses/sysclock.h
diff --git a/.../mpc-hc_subs/src/BaseClasses/transfrm.cpp → .../mpc-hc_subs/src/BaseClasses/transfrm.cpp b/.../mpc-hc_subs/src/BaseClasses/transfrm.cpp → .../mpc-hc_subs/src/BaseClasses/transfrm.cpp
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/transfrm.h → ...rs/mpc-hc_subs/src/BaseClasses/transfrm.h b/...pp/mpc-hc_subs/src/BaseClasses/transfrm.h → ...rs/mpc-hc_subs/src/BaseClasses/transfrm.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/transip.cpp → ...s/mpc-hc_subs/src/BaseClasses/transip.cpp b/...p/mpc-hc_subs/src/BaseClasses/transip.cpp → ...s/mpc-hc_subs/src/BaseClasses/transip.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/transip.h → ...ers/mpc-hc_subs/src/BaseClasses/transip.h b/...cpp/mpc-hc_subs/src/BaseClasses/transip.h → ...ers/mpc-hc_subs/src/BaseClasses/transip.h
diff --git a/.../mpc-hc_subs/src/BaseClasses/videoctl.cpp → .../mpc-hc_subs/src/BaseClasses/videoctl.cpp b/.../mpc-hc_subs/src/BaseClasses/videoctl.cpp → .../mpc-hc_subs/src/BaseClasses/videoctl.cpp
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/videoctl.h → ...rs/mpc-hc_subs/src/BaseClasses/videoctl.h b/...pp/mpc-hc_subs/src/BaseClasses/videoctl.h → ...rs/mpc-hc_subs/src/BaseClasses/videoctl.h
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/vtrans.cpp → ...rs/mpc-hc_subs/src/BaseClasses/vtrans.cpp b/...pp/mpc-hc_subs/src/BaseClasses/vtrans.cpp → ...rs/mpc-hc_subs/src/BaseClasses/vtrans.cpp
diff --git a/....cpp/mpc-hc_subs/src/BaseClasses/vtrans.h → ...ters/mpc-hc_subs/src/BaseClasses/vtrans.h b/....cpp/mpc-hc_subs/src/BaseClasses/vtrans.h → ...ters/mpc-hc_subs/src/BaseClasses/vtrans.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/winctrl.cpp → ...s/mpc-hc_subs/src/BaseClasses/winctrl.cpp b/...p/mpc-hc_subs/src/BaseClasses/winctrl.cpp → ...s/mpc-hc_subs/src/BaseClasses/winctrl.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/winctrl.h → ...ers/mpc-hc_subs/src/BaseClasses/winctrl.h b/...cpp/mpc-hc_subs/src/BaseClasses/winctrl.h → ...ers/mpc-hc_subs/src/BaseClasses/winctrl.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/winutil.cpp → ...s/mpc-hc_subs/src/BaseClasses/winutil.cpp b/...p/mpc-hc_subs/src/BaseClasses/winutil.cpp → ...s/mpc-hc_subs/src/BaseClasses/winutil.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/winutil.h → ...ers/mpc-hc_subs/src/BaseClasses/winutil.h b/...cpp/mpc-hc_subs/src/BaseClasses/winutil.h → ...ers/mpc-hc_subs/src/BaseClasses/winutil.h
diff --git a/...p/mpc-hc_subs/src/BaseClasses/wxdebug.cpp → ...s/mpc-hc_subs/src/BaseClasses/wxdebug.cpp b/...p/mpc-hc_subs/src/BaseClasses/wxdebug.cpp → ...s/mpc-hc_subs/src/BaseClasses/wxdebug.cpp
diff --git a/...cpp/mpc-hc_subs/src/BaseClasses/wxdebug.h → ...ers/mpc-hc_subs/src/BaseClasses/wxdebug.h b/...cpp/mpc-hc_subs/src/BaseClasses/wxdebug.h → ...ers/mpc-hc_subs/src/BaseClasses/wxdebug.h
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/wxlist.cpp → ...rs/mpc-hc_subs/src/BaseClasses/wxlist.cpp b/...pp/mpc-hc_subs/src/BaseClasses/wxlist.cpp → ...rs/mpc-hc_subs/src/BaseClasses/wxlist.cpp
diff --git a/....cpp/mpc-hc_subs/src/BaseClasses/wxlist.h → ...ters/mpc-hc_subs/src/BaseClasses/wxlist.h b/....cpp/mpc-hc_subs/src/BaseClasses/wxlist.h → ...ters/mpc-hc_subs/src/BaseClasses/wxlist.h
diff --git a/...pp/mpc-hc_subs/src/BaseClasses/wxutil.cpp → ...rs/mpc-hc_subs/src/BaseClasses/wxutil.cpp b/...pp/mpc-hc_subs/src/BaseClasses/wxutil.cpp → ...rs/mpc-hc_subs/src/BaseClasses/wxutil.cpp
diff --git a/....cpp/mpc-hc_subs/src/BaseClasses/wxutil.h → ...ters/mpc-hc_subs/src/BaseClasses/wxutil.h b/....cpp/mpc-hc_subs/src/BaseClasses/wxutil.h → ...ters/mpc-hc_subs/src/BaseClasses/wxutil.h
diff --git a/...ortal/Core.cpp/mpc-hc_subs/src/YASM.props → DirectShowFilters/mpc-hc_subs/src/YASM.props b/...ortal/Core.cpp/mpc-hc_subs/src/YASM.props → DirectShowFilters/mpc-hc_subs/src/YASM.props
diff --git a/...tal/Core.cpp/mpc-hc_subs/src/YASM.targets → ...tShowFilters/mpc-hc_subs/src/YASM.targets b/...tal/Core.cpp/mpc-hc_subs/src/YASM.targets → ...tShowFilters/mpc-hc_subs/src/YASM.targets
diff --git a/...aportal/Core.cpp/mpc-hc_subs/src/YASM.xml → DirectShowFilters/mpc-hc_subs/src/YASM.xml b/...aportal/Core.cpp/mpc-hc_subs/src/YASM.xml → DirectShowFilters/mpc-hc_subs/src/YASM.xml
diff --git a/...tal/Core.cpp/mpc-hc_subs/src/common.props → ...tShowFilters/mpc-hc_subs/src/common.props b/...tal/Core.cpp/mpc-hc_subs/src/common.props → ...tShowFilters/mpc-hc_subs/src/common.props
diff --git a/...l/Core.cpp/mpc-hc_subs/src/decss/VobDec.h → ...howFilters/mpc-hc_subs/src/decss/VobDec.h b/...l/Core.cpp/mpc-hc_subs/src/decss/VobDec.h → ...howFilters/mpc-hc_subs/src/decss/VobDec.h
diff --git a/.../Core.cpp/mpc-hc_subs/src/decss/VobFile.h → ...owFilters/mpc-hc_subs/src/decss/VobFile.h b/.../Core.cpp/mpc-hc_subs/src/decss/VobFile.h → ...owFilters/mpc-hc_subs/src/decss/VobFile.h
diff --git a/...mpc-hc_subs/src/dsutil/DSMPropertyBag.cpp → ...mpc-hc_subs/src/dsutil/DSMPropertyBag.cpp b/...mpc-hc_subs/src/dsutil/DSMPropertyBag.cpp → ...mpc-hc_subs/src/dsutil/DSMPropertyBag.cpp
diff --git a/...p/mpc-hc_subs/src/dsutil/DSMPropertyBag.h → ...s/mpc-hc_subs/src/dsutil/DSMPropertyBag.h b/...p/mpc-hc_subs/src/dsutil/DSMPropertyBag.h → ...s/mpc-hc_subs/src/dsutil/DSMPropertyBag.h
diff --git a/...ore.cpp/mpc-hc_subs/src/dsutil/DSUtil.cpp → ...Filters/mpc-hc_subs/src/dsutil/DSUtil.cpp b/...ore.cpp/mpc-hc_subs/src/dsutil/DSUtil.cpp → ...Filters/mpc-hc_subs/src/dsutil/DSUtil.cpp
diff --git a/.../Core.cpp/mpc-hc_subs/src/dsutil/DSUtil.h → ...owFilters/mpc-hc_subs/src/dsutil/DSUtil.h b/.../Core.cpp/mpc-hc_subs/src/dsutil/DSUtil.h → ...owFilters/mpc-hc_subs/src/dsutil/DSUtil.h
diff --git a/...cpp/mpc-hc_subs/src/dsutil/DSUtil.vcxproj → ...ers/mpc-hc_subs/src/dsutil/DSUtil.vcxproj b/...cpp/mpc-hc_subs/src/dsutil/DSUtil.vcxproj → ...ers/mpc-hc_subs/src/dsutil/DSUtil.vcxproj
@@ -26,13 +26,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
@@ -74,7 +74,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;$(SolutionDir)baseclasses;$(DXSDK_DIR)Include;..\thirdparty\VirtualDub\h;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Lib>
@@ -104,7 +104,7 @@
     </CustomBuildStep>
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;$(SolutionDir)baseclasses;$(DXSDK_DIR)Include;..\thirdparty\VirtualDub\h;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>

diff --git a/...hc_subs/src/dsutil/DSUtil.vcxproj.filters → ...hc_subs/src/dsutil/DSUtil.vcxproj.filters b/...hc_subs/src/dsutil/DSUtil.vcxproj.filters → ...hc_subs/src/dsutil/DSUtil.vcxproj.filters
diff --git a/DirectShowFilters/mpc-hc_subs/src/dsutil/DSUtil.vcxproj.user b/DirectShowFilters/mpc-hc_subs/src/dsutil/DSUtil.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/.../mpc-hc_subs/src/dsutil/FontInstaller.cpp → .../mpc-hc_subs/src/dsutil/FontInstaller.cpp b/.../mpc-hc_subs/src/dsutil/FontInstaller.cpp → .../mpc-hc_subs/src/dsutil/FontInstaller.cpp
diff --git a/...pp/mpc-hc_subs/src/dsutil/FontInstaller.h → ...rs/mpc-hc_subs/src/dsutil/FontInstaller.h b/...pp/mpc-hc_subs/src/dsutil/FontInstaller.h → ...rs/mpc-hc_subs/src/dsutil/FontInstaller.h
diff --git a/...p/mpc-hc_subs/src/dsutil/GolombBuffer.cpp → ...s/mpc-hc_subs/src/dsutil/GolombBuffer.cpp b/...p/mpc-hc_subs/src/dsutil/GolombBuffer.cpp → ...s/mpc-hc_subs/src/dsutil/GolombBuffer.cpp
diff --git a/...cpp/mpc-hc_subs/src/dsutil/GolombBuffer.h → ...ers/mpc-hc_subs/src/dsutil/GolombBuffer.h b/...cpp/mpc-hc_subs/src/dsutil/GolombBuffer.h → ...ers/mpc-hc_subs/src/dsutil/GolombBuffer.h
diff --git a/...e.cpp/mpc-hc_subs/src/dsutil/H264Nalu.cpp → ...lters/mpc-hc_subs/src/dsutil/H264Nalu.cpp b/...e.cpp/mpc-hc_subs/src/dsutil/H264Nalu.cpp → ...lters/mpc-hc_subs/src/dsutil/H264Nalu.cpp
diff --git a/...ore.cpp/mpc-hc_subs/src/dsutil/H264Nalu.h → ...Filters/mpc-hc_subs/src/dsutil/H264Nalu.h b/...ore.cpp/mpc-hc_subs/src/dsutil/H264Nalu.h → ...Filters/mpc-hc_subs/src/dsutil/H264Nalu.h
diff --git a/...p/mpc-hc_subs/src/dsutil/HdmvClipInfo.cpp → ...s/mpc-hc_subs/src/dsutil/HdmvClipInfo.cpp b/...p/mpc-hc_subs/src/dsutil/HdmvClipInfo.cpp → ...s/mpc-hc_subs/src/dsutil/HdmvClipInfo.cpp
diff --git a/...cpp/mpc-hc_subs/src/dsutil/HdmvClipInfo.h → ...ers/mpc-hc_subs/src/dsutil/HdmvClipInfo.h b/...cpp/mpc-hc_subs/src/dsutil/HdmvClipInfo.h → ...ers/mpc-hc_subs/src/dsutil/HdmvClipInfo.h
diff --git a/...pp/mpc-hc_subs/src/dsutil/MediaTypeEx.cpp → ...rs/mpc-hc_subs/src/dsutil/MediaTypeEx.cpp b/...pp/mpc-hc_subs/src/dsutil/MediaTypeEx.cpp → ...rs/mpc-hc_subs/src/dsutil/MediaTypeEx.cpp
diff --git a/....cpp/mpc-hc_subs/src/dsutil/MediaTypeEx.h → ...ters/mpc-hc_subs/src/dsutil/MediaTypeEx.h b/....cpp/mpc-hc_subs/src/dsutil/MediaTypeEx.h → ...ters/mpc-hc_subs/src/dsutil/MediaTypeEx.h
diff --git a/...cpp/mpc-hc_subs/src/dsutil/MediaTypes.cpp → ...ers/mpc-hc_subs/src/dsutil/MediaTypes.cpp b/...cpp/mpc-hc_subs/src/dsutil/MediaTypes.cpp → ...ers/mpc-hc_subs/src/dsutil/MediaTypes.cpp
diff --git a/...e.cpp/mpc-hc_subs/src/dsutil/MediaTypes.h → ...lters/mpc-hc_subs/src/dsutil/MediaTypes.h b/...e.cpp/mpc-hc_subs/src/dsutil/MediaTypes.h → ...lters/mpc-hc_subs/src/dsutil/MediaTypes.h
diff --git a/...ore.cpp/mpc-hc_subs/src/dsutil/Mpeg2Def.h → ...Filters/mpc-hc_subs/src/dsutil/Mpeg2Def.h b/...ore.cpp/mpc-hc_subs/src/dsutil/Mpeg2Def.h → ...Filters/mpc-hc_subs/src/dsutil/Mpeg2Def.h
diff --git a/.../mpc-hc_subs/src/dsutil/NullRenderers.cpp → .../mpc-hc_subs/src/dsutil/NullRenderers.cpp b/.../mpc-hc_subs/src/dsutil/NullRenderers.cpp → .../mpc-hc_subs/src/dsutil/NullRenderers.cpp
diff --git a/...pp/mpc-hc_subs/src/dsutil/NullRenderers.h → ...rs/mpc-hc_subs/src/dsutil/NullRenderers.h b/...pp/mpc-hc_subs/src/dsutil/NullRenderers.h → ...rs/mpc-hc_subs/src/dsutil/NullRenderers.h
diff --git a/...pp/mpc-hc_subs/src/dsutil/SharedInclude.h → ...rs/mpc-hc_subs/src/dsutil/SharedInclude.h b/...pp/mpc-hc_subs/src/dsutil/SharedInclude.h → ...rs/mpc-hc_subs/src/dsutil/SharedInclude.h
diff --git a/...l/Core.cpp/mpc-hc_subs/src/dsutil/csimd.h → ...howFilters/mpc-hc_subs/src/dsutil/csimd.h b/...l/Core.cpp/mpc-hc_subs/src/dsutil/csimd.h → ...howFilters/mpc-hc_subs/src/dsutil/csimd.h
diff --git a/...e.cpp/mpc-hc_subs/src/dsutil/mmintrin64.c → ...lters/mpc-hc_subs/src/dsutil/mmintrin64.c b/...e.cpp/mpc-hc_subs/src/dsutil/mmintrin64.c → ...lters/mpc-hc_subs/src/dsutil/mmintrin64.c
diff --git a/...al/Core.cpp/mpc-hc_subs/src/dsutil/simd.h → ...ShowFilters/mpc-hc_subs/src/dsutil/simd.h b/...al/Core.cpp/mpc-hc_subs/src/dsutil/simd.h → ...ShowFilters/mpc-hc_subs/src/dsutil/simd.h
diff --git a/....cpp/mpc-hc_subs/src/dsutil/simd_common.h → ...ters/mpc-hc_subs/src/dsutil/simd_common.h b/....cpp/mpc-hc_subs/src/dsutil/simd_common.h → ...ters/mpc-hc_subs/src/dsutil/simd_common.h
diff --git a/...pc-hc_subs/src/dsutil/simd_instructions.h → ...pc-hc_subs/src/dsutil/simd_instructions.h b/...pc-hc_subs/src/dsutil/simd_instructions.h → ...pc-hc_subs/src/dsutil/simd_instructions.h
diff --git a/...ore.cpp/mpc-hc_subs/src/dsutil/stdafx.cpp → ...Filters/mpc-hc_subs/src/dsutil/stdafx.cpp b/...ore.cpp/mpc-hc_subs/src/dsutil/stdafx.cpp → ...Filters/mpc-hc_subs/src/dsutil/stdafx.cpp
diff --git a/.../Core.cpp/mpc-hc_subs/src/dsutil/stdafx.h → ...owFilters/mpc-hc_subs/src/dsutil/stdafx.h b/.../Core.cpp/mpc-hc_subs/src/dsutil/stdafx.h → ...owFilters/mpc-hc_subs/src/dsutil/stdafx.h
diff --git a/.../Core.cpp/mpc-hc_subs/src/dsutil/text.cpp → ...owFilters/mpc-hc_subs/src/dsutil/text.cpp b/.../Core.cpp/mpc-hc_subs/src/dsutil/text.cpp → ...owFilters/mpc-hc_subs/src/dsutil/text.cpp
diff --git a/...al/Core.cpp/mpc-hc_subs/src/dsutil/text.h → ...ShowFilters/mpc-hc_subs/src/dsutil/text.h b/...al/Core.cpp/mpc-hc_subs/src/dsutil/text.h → ...ShowFilters/mpc-hc_subs/src/dsutil/text.h
diff --git a/...al/Core.cpp/mpc-hc_subs/src/dsutil/vd.cpp → ...ShowFilters/mpc-hc_subs/src/dsutil/vd.cpp b/...al/Core.cpp/mpc-hc_subs/src/dsutil/vd.cpp → ...ShowFilters/mpc-hc_subs/src/dsutil/vd.cpp
diff --git a/...rtal/Core.cpp/mpc-hc_subs/src/dsutil/vd.h → ...ctShowFilters/mpc-hc_subs/src/dsutil/vd.h b/...rtal/Core.cpp/mpc-hc_subs/src/dsutil/vd.h → ...ctShowFilters/mpc-hc_subs/src/dsutil/vd.h
diff --git a/...ore.cpp/mpc-hc_subs/src/dsutil/vd_asm.cpp → ...Filters/mpc-hc_subs/src/dsutil/vd_asm.cpp b/...ore.cpp/mpc-hc_subs/src/dsutil/vd_asm.cpp → ...Filters/mpc-hc_subs/src/dsutil/vd_asm.cpp
diff --git a/.../Core.cpp/mpc-hc_subs/src/dsutil/vd_asm.h → ...owFilters/mpc-hc_subs/src/dsutil/vd_asm.h b/.../Core.cpp/mpc-hc_subs/src/dsutil/vd_asm.h → ...owFilters/mpc-hc_subs/src/dsutil/vd_asm.h
diff --git a/.../mpc-hc_subs/src/mpc-hc_subs/IPinHook.cpp → .../mpc-hc_subs/src/mpc-hc_subs/IPinHook.cpp b/.../mpc-hc_subs/src/mpc-hc_subs/IPinHook.cpp → .../mpc-hc_subs/src/mpc-hc_subs/IPinHook.cpp
diff --git a/...pp/mpc-hc_subs/src/mpc-hc_subs/IPinHook.h → ...rs/mpc-hc_subs/src/mpc-hc_subs/IPinHook.h b/...pp/mpc-hc_subs/src/mpc-hc_subs/IPinHook.h → ...rs/mpc-hc_subs/src/mpc-hc_subs/IPinHook.h
diff --git a/...pc-hc_subs/src/mpc-hc_subs/SubManager.cpp → ...pc-hc_subs/src/mpc-hc_subs/SubManager.cpp b/...pc-hc_subs/src/mpc-hc_subs/SubManager.cpp → ...pc-hc_subs/src/mpc-hc_subs/SubManager.cpp
diff --git a/.../mpc-hc_subs/src/mpc-hc_subs/SubManager.h → .../mpc-hc_subs/src/mpc-hc_subs/SubManager.h b/.../mpc-hc_subs/src/mpc-hc_subs/SubManager.h → .../mpc-hc_subs/src/mpc-hc_subs/SubManager.h
diff --git a/...mpc-hc_subs/src/mpc-hc_subs/Subresync.cpp → ...mpc-hc_subs/src/mpc-hc_subs/Subresync.cpp b/...mpc-hc_subs/src/mpc-hc_subs/Subresync.cpp → ...mpc-hc_subs/src/mpc-hc_subs/Subresync.cpp
diff --git a/...p/mpc-hc_subs/src/mpc-hc_subs/Subresync.h → ...s/mpc-hc_subs/src/mpc-hc_subs/Subresync.h b/...p/mpc-hc_subs/src/mpc-hc_subs/Subresync.h → ...s/mpc-hc_subs/src/mpc-hc_subs/Subresync.h
diff --git a/...bs/src/mpc-hc_subs/TextPassThruFilter.cpp → ...bs/src/mpc-hc_subs/TextPassThruFilter.cpp b/...bs/src/mpc-hc_subs/TextPassThruFilter.cpp → ...bs/src/mpc-hc_subs/TextPassThruFilter.cpp
diff --git a/...subs/src/mpc-hc_subs/TextPassThruFilter.h → ...subs/src/mpc-hc_subs/TextPassThruFilter.h b/...subs/src/mpc-hc_subs/TextPassThruFilter.h → ...subs/src/mpc-hc_subs/TextPassThruFilter.h
diff --git a/..._subs/src/mpc-hc_subs/mpc-hc_subs.vcxproj → ..._subs/src/mpc-hc_subs/mpc-hc_subs.vcxproj b/..._subs/src/mpc-hc_subs/mpc-hc_subs.vcxproj → ..._subs/src/mpc-hc_subs/mpc-hc_subs.vcxproj
@@ -25,7 +25,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
@@ -52,23 +52,24 @@
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)mpc-hc_subs\bin\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)mpc-hc_subs\bin\obj\$(Configuration)_$(PlatformName)\$(ProjectName)\</IntDir>
+    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../include;../BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MPCSUBS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;MPCSUBS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Winmm.lib;vfw32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>strmbasd.lib;Winmm.lib;vfw32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)baseclasses\debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -79,7 +80,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>../../include;../BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MPCSUBS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;MPCSUBS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PrecompiledHeader>
@@ -90,15 +91,15 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>Winmm.lib;vfw32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)baseclasses\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
     <PostBuildEvent>
-      <Command>copy /y "$(OutDir)$(ProjectName).dll" ..\..\..\..\MediaPortal.Base\</Command>
+      <Command>copy /y "$(OutDir)$(ProjectName).dll" "$(SolutionDir)\..\mediaportal\MediaPortal.Base\"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -122,9 +123,8 @@
     <ResourceCompile Include="mpcSubs.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\BaseClasses\baseclasses.vcxproj">
+    <ProjectReference Include="..\..\..\baseclasses\BaseClasses.vcxproj">
       <Project>{e8a3f6fa-ae1c-4c8e-a0b6-9c8480324eaa}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
     <ProjectReference Include="..\dsutil\DSUtil.vcxproj">
       <Project>{fc70988b-1ae5-4381-866d-4f405e28ac42}</Project>

diff --git a/...c/mpc-hc_subs/mpc-hc_subs.vcxproj.filters → ...c/mpc-hc_subs/mpc-hc_subs.vcxproj.filters b/...c/mpc-hc_subs/mpc-hc_subs.vcxproj.filters → ...c/mpc-hc_subs/mpc-hc_subs.vcxproj.filters
diff --git a/DirectShowFilters/mpc-hc_subs/src/mpc-hc_subs/mpc-hc_subs.vcxproj.user b/DirectShowFilters/mpc-hc_subs/src/mpc-hc_subs/mpc-hc_subs.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/...p/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.cpp → ...s/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.cpp b/...p/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.cpp → ...s/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.cpp
diff --git a/...cpp/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.h → ...ers/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.h b/...cpp/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.h → ...ers/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.h
diff --git a/...pp/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.rc → ...rs/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.rc b/...pp/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.rc → ...rs/mpc-hc_subs/src/mpc-hc_subs/mpcSubs.rc
diff --git a/...pp/mpc-hc_subs/src/mpc-hc_subs/resource.h → ...rs/mpc-hc_subs/src/mpc-hc_subs/resource.h b/...pp/mpc-hc_subs/src/mpc-hc_subs/resource.h → ...rs/mpc-hc_subs/src/mpc-hc_subs/resource.h
diff --git a/...pp/mpc-hc_subs/src/mpc-hc_subs/stdafx.cpp → ...rs/mpc-hc_subs/src/mpc-hc_subs/stdafx.cpp b/...pp/mpc-hc_subs/src/mpc-hc_subs/stdafx.cpp → ...rs/mpc-hc_subs/src/mpc-hc_subs/stdafx.cpp
diff --git a/....cpp/mpc-hc_subs/src/mpc-hc_subs/stdafx.h → ...ters/mpc-hc_subs/src/mpc-hc_subs/stdafx.h b/....cpp/mpc-hc_subs/src/mpc-hc_subs/stdafx.h → ...ters/mpc-hc_subs/src/mpc-hc_subs/stdafx.h
diff --git a/....cpp/mpc-hc_subs/src/subpic/CoordGeom.cpp → ...ters/mpc-hc_subs/src/subpic/CoordGeom.cpp b/....cpp/mpc-hc_subs/src/subpic/CoordGeom.cpp → ...ters/mpc-hc_subs/src/subpic/CoordGeom.cpp
diff --git a/...re.cpp/mpc-hc_subs/src/subpic/CoordGeom.h → ...ilters/mpc-hc_subs/src/subpic/CoordGeom.h b/...re.cpp/mpc-hc_subs/src/subpic/CoordGeom.h → ...ilters/mpc-hc_subs/src/subpic/CoordGeom.h
diff --git a/....cpp/mpc-hc_subs/src/subpic/DX9SubPic.cpp → ...ters/mpc-hc_subs/src/subpic/DX9SubPic.cpp b/....cpp/mpc-hc_subs/src/subpic/DX9SubPic.cpp → ...ters/mpc-hc_subs/src/subpic/DX9SubPic.cpp
diff --git a/...re.cpp/mpc-hc_subs/src/subpic/DX9SubPic.h → ...ilters/mpc-hc_subs/src/subpic/DX9SubPic.h b/...re.cpp/mpc-hc_subs/src/subpic/DX9SubPic.h → ...ilters/mpc-hc_subs/src/subpic/DX9SubPic.h
diff --git a/...Core.cpp/mpc-hc_subs/src/subpic/ISubPic.h → ...wFilters/mpc-hc_subs/src/subpic/ISubPic.h b/...Core.cpp/mpc-hc_subs/src/subpic/ISubPic.h → ...wFilters/mpc-hc_subs/src/subpic/ISubPic.h
diff --git a/...e.cpp/mpc-hc_subs/src/subpic/ISubRender.h → ...lters/mpc-hc_subs/src/subpic/ISubRender.h b/...e.cpp/mpc-hc_subs/src/subpic/ISubRender.h → ...lters/mpc-hc_subs/src/subpic/ISubRender.h
diff --git a/....cpp/mpc-hc_subs/src/subpic/MemSubPic.cpp → ...ters/mpc-hc_subs/src/subpic/MemSubPic.cpp b/....cpp/mpc-hc_subs/src/subpic/MemSubPic.cpp → ...ters/mpc-hc_subs/src/subpic/MemSubPic.cpp
diff --git a/...re.cpp/mpc-hc_subs/src/subpic/MemSubPic.h → ...ilters/mpc-hc_subs/src/subpic/MemSubPic.h b/...re.cpp/mpc-hc_subs/src/subpic/MemSubPic.h → ...ilters/mpc-hc_subs/src/subpic/MemSubPic.h
diff --git a/...c/subpic/SubPicAllocatorPresenterImpl.cpp → ...c/subpic/SubPicAllocatorPresenterImpl.cpp b/...c/subpic/SubPicAllocatorPresenterImpl.cpp → ...c/subpic/SubPicAllocatorPresenterImpl.cpp
diff --git a/...src/subpic/SubPicAllocatorPresenterImpl.h → ...src/subpic/SubPicAllocatorPresenterImpl.h b/...src/subpic/SubPicAllocatorPresenterImpl.h → ...src/subpic/SubPicAllocatorPresenterImpl.h
diff --git a/...cpp/mpc-hc_subs/src/subpic/SubPicImpl.cpp → ...ers/mpc-hc_subs/src/subpic/SubPicImpl.cpp b/...cpp/mpc-hc_subs/src/subpic/SubPicImpl.cpp → ...ers/mpc-hc_subs/src/subpic/SubPicImpl.cpp
diff --git a/...e.cpp/mpc-hc_subs/src/subpic/SubPicImpl.h → ...lters/mpc-hc_subs/src/subpic/SubPicImpl.h b/...e.cpp/mpc-hc_subs/src/subpic/SubPicImpl.h → ...lters/mpc-hc_subs/src/subpic/SubPicImpl.h
diff --git a/...hc_subs/src/subpic/SubPicProviderImpl.cpp → ...hc_subs/src/subpic/SubPicProviderImpl.cpp b/...hc_subs/src/subpic/SubPicProviderImpl.cpp → ...hc_subs/src/subpic/SubPicProviderImpl.cpp
diff --git a/...c-hc_subs/src/subpic/SubPicProviderImpl.h → ...c-hc_subs/src/subpic/SubPicProviderImpl.h b/...c-hc_subs/src/subpic/SubPicProviderImpl.h → ...c-hc_subs/src/subpic/SubPicProviderImpl.h
diff --git a/...pc-hc_subs/src/subpic/SubPicQueueImpl.cpp → ...pc-hc_subs/src/subpic/SubPicQueueImpl.cpp b/...pc-hc_subs/src/subpic/SubPicQueueImpl.cpp → ...pc-hc_subs/src/subpic/SubPicQueueImpl.cpp
diff --git a/.../mpc-hc_subs/src/subpic/SubPicQueueImpl.h → .../mpc-hc_subs/src/subpic/SubPicQueueImpl.h b/.../mpc-hc_subs/src/subpic/SubPicQueueImpl.h → .../mpc-hc_subs/src/subpic/SubPicQueueImpl.h
diff --git a/...ore.cpp/mpc-hc_subs/src/subpic/stdafx.cpp → ...Filters/mpc-hc_subs/src/subpic/stdafx.cpp b/...ore.cpp/mpc-hc_subs/src/subpic/stdafx.cpp → ...Filters/mpc-hc_subs/src/subpic/stdafx.cpp
diff --git a/.../Core.cpp/mpc-hc_subs/src/subpic/stdafx.h → ...owFilters/mpc-hc_subs/src/subpic/stdafx.h b/.../Core.cpp/mpc-hc_subs/src/subpic/stdafx.h → ...owFilters/mpc-hc_subs/src/subpic/stdafx.h
diff --git a/...cpp/mpc-hc_subs/src/subpic/subpic.vcxproj → ...ers/mpc-hc_subs/src/subpic/subpic.vcxproj b/...cpp/mpc-hc_subs/src/subpic/subpic.vcxproj → ...ers/mpc-hc_subs/src/subpic/subpic.vcxproj
@@ -74,7 +74,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\BaseClasses;..\..\include\dx;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>d3d9.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -100,7 +101,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\BaseClasses;..\..\include\dx;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>

diff --git a/...hc_subs/src/subpic/subpic.vcxproj.filters → ...hc_subs/src/subpic/subpic.vcxproj.filters b/...hc_subs/src/subpic/subpic.vcxproj.filters → ...hc_subs/src/subpic/subpic.vcxproj.filters
diff --git a/DirectShowFilters/mpc-hc_subs/src/subpic/subpic.vcxproj.user b/DirectShowFilters/mpc-hc_subs/src/subpic/subpic.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/...cpp/mpc-hc_subs/src/subtitles/BaseSub.cpp → ...ers/mpc-hc_subs/src/subtitles/BaseSub.cpp b/...cpp/mpc-hc_subs/src/subtitles/BaseSub.cpp → ...ers/mpc-hc_subs/src/subtitles/BaseSub.cpp
diff --git a/...e.cpp/mpc-hc_subs/src/subtitles/BaseSub.h → ...lters/mpc-hc_subs/src/subtitles/BaseSub.h b/...e.cpp/mpc-hc_subs/src/subtitles/BaseSub.h → ...lters/mpc-hc_subs/src/subtitles/BaseSub.h
diff --git a/...p/mpc-hc_subs/src/subtitles/CCDecoder.cpp → ...s/mpc-hc_subs/src/subtitles/CCDecoder.cpp b/...p/mpc-hc_subs/src/subtitles/CCDecoder.cpp → ...s/mpc-hc_subs/src/subtitles/CCDecoder.cpp
diff --git a/...cpp/mpc-hc_subs/src/subtitles/CCDecoder.h → ...ers/mpc-hc_subs/src/subtitles/CCDecoder.h b/...cpp/mpc-hc_subs/src/subtitles/CCDecoder.h → ...ers/mpc-hc_subs/src/subtitles/CCDecoder.h
diff --git a/..._subs/src/subtitles/CompositionObject.cpp → ..._subs/src/subtitles/CompositionObject.cpp b/..._subs/src/subtitles/CompositionObject.cpp → ..._subs/src/subtitles/CompositionObject.cpp
diff --git a/...hc_subs/src/subtitles/CompositionObject.h → ...hc_subs/src/subtitles/CompositionObject.h b/...hc_subs/src/subtitles/CompositionObject.h → ...hc_subs/src/subtitles/CompositionObject.h
diff --git a/....cpp/mpc-hc_subs/src/subtitles/DVBSub.cpp → ...ters/mpc-hc_subs/src/subtitles/DVBSub.cpp b/....cpp/mpc-hc_subs/src/subtitles/DVBSub.cpp → ...ters/mpc-hc_subs/src/subtitles/DVBSub.cpp
diff --git a/...re.cpp/mpc-hc_subs/src/subtitles/DVBSub.h → ...ilters/mpc-hc_subs/src/subtitles/DVBSub.h b/...re.cpp/mpc-hc_subs/src/subtitles/DVBSub.h → ...ilters/mpc-hc_subs/src/subtitles/DVBSub.h
diff --git a/...ore.cpp/mpc-hc_subs/src/subtitles/GFN.cpp → ...Filters/mpc-hc_subs/src/subtitles/GFN.cpp b/...ore.cpp/mpc-hc_subs/src/subtitles/GFN.cpp → ...Filters/mpc-hc_subs/src/subtitles/GFN.cpp
diff --git a/.../Core.cpp/mpc-hc_subs/src/subtitles/GFN.h → ...owFilters/mpc-hc_subs/src/subtitles/GFN.h b/.../Core.cpp/mpc-hc_subs/src/subtitles/GFN.h → ...owFilters/mpc-hc_subs/src/subtitles/GFN.h
diff --git a/...cpp/mpc-hc_subs/src/subtitles/HdmvSub.cpp → ...ers/mpc-hc_subs/src/subtitles/HdmvSub.cpp b/...cpp/mpc-hc_subs/src/subtitles/HdmvSub.cpp → ...ers/mpc-hc_subs/src/subtitles/HdmvSub.cpp
diff --git a/...e.cpp/mpc-hc_subs/src/subtitles/HdmvSub.h → ...lters/mpc-hc_subs/src/subtitles/HdmvSub.h b/...e.cpp/mpc-hc_subs/src/subtitles/HdmvSub.h → ...lters/mpc-hc_subs/src/subtitles/HdmvSub.h
diff --git a/...ore.cpp/mpc-hc_subs/src/subtitles/RTS.cpp → ...Filters/mpc-hc_subs/src/subtitles/RTS.cpp b/...ore.cpp/mpc-hc_subs/src/subtitles/RTS.cpp → ...Filters/mpc-hc_subs/src/subtitles/RTS.cpp
diff --git a/.../Core.cpp/mpc-hc_subs/src/subtitles/RTS.h → ...owFilters/mpc-hc_subs/src/subtitles/RTS.h b/.../Core.cpp/mpc-hc_subs/src/subtitles/RTS.h → ...owFilters/mpc-hc_subs/src/subtitles/RTS.h
diff --git a/.../mpc-hc_subs/src/subtitles/Rasterizer.cpp → .../mpc-hc_subs/src/subtitles/Rasterizer.cpp b/.../mpc-hc_subs/src/subtitles/Rasterizer.cpp → .../mpc-hc_subs/src/subtitles/Rasterizer.cpp
diff --git a/...pp/mpc-hc_subs/src/subtitles/Rasterizer.h → ...rs/mpc-hc_subs/src/subtitles/Rasterizer.h b/...pp/mpc-hc_subs/src/subtitles/Rasterizer.h → ...rs/mpc-hc_subs/src/subtitles/Rasterizer.h
diff --git a/...-hc_subs/src/subtitles/RealTextParser.cpp → ...-hc_subs/src/subtitles/RealTextParser.cpp b/...-hc_subs/src/subtitles/RealTextParser.cpp → ...-hc_subs/src/subtitles/RealTextParser.cpp
diff --git a/...pc-hc_subs/src/subtitles/RealTextParser.h → ...pc-hc_subs/src/subtitles/RealTextParser.h b/...pc-hc_subs/src/subtitles/RealTextParser.h → ...pc-hc_subs/src/subtitles/RealTextParser.h
diff --git a/...bs/src/subtitles/RenderedHdmvSubtitle.cpp → ...bs/src/subtitles/RenderedHdmvSubtitle.cpp b/...bs/src/subtitles/RenderedHdmvSubtitle.cpp → ...bs/src/subtitles/RenderedHdmvSubtitle.cpp
diff --git a/...subs/src/subtitles/RenderedHdmvSubtitle.h → ...subs/src/subtitles/RenderedHdmvSubtitle.h b/...subs/src/subtitles/RenderedHdmvSubtitle.h → ...subs/src/subtitles/RenderedHdmvSubtitle.h
diff --git a/...ore.cpp/mpc-hc_subs/src/subtitles/SSF.cpp → ...Filters/mpc-hc_subs/src/subtitles/SSF.cpp b/...ore.cpp/mpc-hc_subs/src/subtitles/SSF.cpp → ...Filters/mpc-hc_subs/src/subtitles/SSF.cpp
diff --git a/.../Core.cpp/mpc-hc_subs/src/subtitles/SSF.h → ...owFilters/mpc-hc_subs/src/subtitles/SSF.h b/.../Core.cpp/mpc-hc_subs/src/subtitles/SSF.h → ...owFilters/mpc-hc_subs/src/subtitles/SSF.h
diff --git a/...ore.cpp/mpc-hc_subs/src/subtitles/STS.cpp → ...Filters/mpc-hc_subs/src/subtitles/STS.cpp b/...ore.cpp/mpc-hc_subs/src/subtitles/STS.cpp → ...Filters/mpc-hc_subs/src/subtitles/STS.cpp
diff --git a/.../Core.cpp/mpc-hc_subs/src/subtitles/STS.h → ...owFilters/mpc-hc_subs/src/subtitles/STS.h b/.../Core.cpp/mpc-hc_subs/src/subtitles/STS.h → ...owFilters/mpc-hc_subs/src/subtitles/STS.h
diff --git a/...c-hc_subs/src/subtitles/SeparableFilter.h → ...c-hc_subs/src/subtitles/SeparableFilter.h b/...c-hc_subs/src/subtitles/SeparableFilter.h → ...c-hc_subs/src/subtitles/SeparableFilter.h
diff --git a/...c_subs/src/subtitles/SubtitleInputPin.cpp → ...c_subs/src/subtitles/SubtitleInputPin.cpp b/...c_subs/src/subtitles/SubtitleInputPin.cpp → ...c_subs/src/subtitles/SubtitleInputPin.cpp
diff --git a/...-hc_subs/src/subtitles/SubtitleInputPin.h → ...-hc_subs/src/subtitles/SubtitleInputPin.h b/...-hc_subs/src/subtitles/SubtitleInputPin.h → ...-hc_subs/src/subtitles/SubtitleInputPin.h
diff --git a/...pp/mpc-hc_subs/src/subtitles/TextFile.cpp → ...rs/mpc-hc_subs/src/subtitles/TextFile.cpp b/...pp/mpc-hc_subs/src/subtitles/TextFile.cpp → ...rs/mpc-hc_subs/src/subtitles/TextFile.cpp
diff --git a/....cpp/mpc-hc_subs/src/subtitles/TextFile.h → ...ters/mpc-hc_subs/src/subtitles/TextFile.h b/....cpp/mpc-hc_subs/src/subtitles/TextFile.h → ...ters/mpc-hc_subs/src/subtitles/TextFile.h
diff --git a/...pc-hc_subs/src/subtitles/USFSubtitles.cpp → ...pc-hc_subs/src/subtitles/USFSubtitles.cpp b/...pc-hc_subs/src/subtitles/USFSubtitles.cpp → ...pc-hc_subs/src/subtitles/USFSubtitles.cpp
diff --git a/.../mpc-hc_subs/src/subtitles/USFSubtitles.h → .../mpc-hc_subs/src/subtitles/USFSubtitles.h b/.../mpc-hc_subs/src/subtitles/USFSubtitles.h → .../mpc-hc_subs/src/subtitles/USFSubtitles.h
diff --git a/.../mpc-hc_subs/src/subtitles/VobSubFile.cpp → .../mpc-hc_subs/src/subtitles/VobSubFile.cpp b/.../mpc-hc_subs/src/subtitles/VobSubFile.cpp → .../mpc-hc_subs/src/subtitles/VobSubFile.cpp
diff --git a/...pp/mpc-hc_subs/src/subtitles/VobSubFile.h → ...rs/mpc-hc_subs/src/subtitles/VobSubFile.h b/...pp/mpc-hc_subs/src/subtitles/VobSubFile.h → ...rs/mpc-hc_subs/src/subtitles/VobSubFile.h
diff --git a/...c_subs/src/subtitles/VobSubFileRipper.cpp → ...c_subs/src/subtitles/VobSubFileRipper.cpp b/...c_subs/src/subtitles/VobSubFileRipper.cpp → ...c_subs/src/subtitles/VobSubFileRipper.cpp
diff --git a/...-hc_subs/src/subtitles/VobSubFileRipper.h → ...-hc_subs/src/subtitles/VobSubFileRipper.h b/...-hc_subs/src/subtitles/VobSubFileRipper.h → ...-hc_subs/src/subtitles/VobSubFileRipper.h
diff --git a/...mpc-hc_subs/src/subtitles/VobSubImage.cpp → ...mpc-hc_subs/src/subtitles/VobSubImage.cpp b/...mpc-hc_subs/src/subtitles/VobSubImage.cpp → ...mpc-hc_subs/src/subtitles/VobSubImage.cpp
diff --git a/...p/mpc-hc_subs/src/subtitles/VobSubImage.h → ...s/mpc-hc_subs/src/subtitles/VobSubImage.h b/...p/mpc-hc_subs/src/subtitles/VobSubImage.h → ...s/mpc-hc_subs/src/subtitles/VobSubImage.h
diff --git a/...c-hc_subs/src/subtitles/libssf/Arabic.cpp → ...c-hc_subs/src/subtitles/libssf/Arabic.cpp b/...c-hc_subs/src/subtitles/libssf/Arabic.cpp → ...c-hc_subs/src/subtitles/libssf/Arabic.cpp
diff --git a/...mpc-hc_subs/src/subtitles/libssf/Arabic.h → ...mpc-hc_subs/src/subtitles/libssf/Arabic.h b/...mpc-hc_subs/src/subtitles/libssf/Arabic.h → ...mpc-hc_subs/src/subtitles/libssf/Arabic.h
diff --git a/...pc-hc_subs/src/subtitles/libssf/Array.cpp → ...pc-hc_subs/src/subtitles/libssf/Array.cpp b/...pc-hc_subs/src/subtitles/libssf/Array.cpp → ...pc-hc_subs/src/subtitles/libssf/Array.cpp
diff --git a/.../mpc-hc_subs/src/subtitles/libssf/Array.h → .../mpc-hc_subs/src/subtitles/libssf/Array.h b/.../mpc-hc_subs/src/subtitles/libssf/Array.h → .../mpc-hc_subs/src/subtitles/libssf/Array.h
diff --git a/...c_subs/src/subtitles/libssf/Exception.cpp → ...c_subs/src/subtitles/libssf/Exception.cpp b/...c_subs/src/subtitles/libssf/Exception.cpp → ...c_subs/src/subtitles/libssf/Exception.cpp
diff --git a/...-hc_subs/src/subtitles/libssf/Exception.h → ...-hc_subs/src/subtitles/libssf/Exception.h b/...-hc_subs/src/subtitles/libssf/Exception.h → ...-hc_subs/src/subtitles/libssf/Exception.h
diff --git a/...mpc-hc_subs/src/subtitles/libssf/File.cpp → ...mpc-hc_subs/src/subtitles/libssf/File.cpp b/...mpc-hc_subs/src/subtitles/libssf/File.cpp → ...mpc-hc_subs/src/subtitles/libssf/File.cpp
diff --git a/...p/mpc-hc_subs/src/subtitles/libssf/File.h → ...s/mpc-hc_subs/src/subtitles/libssf/File.h b/...p/mpc-hc_subs/src/subtitles/libssf/File.h → ...s/mpc-hc_subs/src/subtitles/libssf/File.h
diff --git a/...subs/src/subtitles/libssf/FontWrapper.cpp → ...subs/src/subtitles/libssf/FontWrapper.cpp b/...subs/src/subtitles/libssf/FontWrapper.cpp → ...subs/src/subtitles/libssf/FontWrapper.cpp
diff --git a/...c_subs/src/subtitles/libssf/FontWrapper.h → ...c_subs/src/subtitles/libssf/FontWrapper.h b/...c_subs/src/subtitles/libssf/FontWrapper.h → ...c_subs/src/subtitles/libssf/FontWrapper.h
diff --git a/...pc-hc_subs/src/subtitles/libssf/Glyph.cpp → ...pc-hc_subs/src/subtitles/libssf/Glyph.cpp b/...pc-hc_subs/src/subtitles/libssf/Glyph.cpp → ...pc-hc_subs/src/subtitles/libssf/Glyph.cpp
diff --git a/.../mpc-hc_subs/src/subtitles/libssf/Glyph.h → .../mpc-hc_subs/src/subtitles/libssf/Glyph.h b/.../mpc-hc_subs/src/subtitles/libssf/Glyph.h → .../mpc-hc_subs/src/subtitles/libssf/Glyph.h
diff --git a/...c_subs/src/subtitles/libssf/GlyphPath.cpp → ...c_subs/src/subtitles/libssf/GlyphPath.cpp b/...c_subs/src/subtitles/libssf/GlyphPath.cpp → ...c_subs/src/subtitles/libssf/GlyphPath.cpp
diff --git a/...-hc_subs/src/subtitles/libssf/GlyphPath.h → ...-hc_subs/src/subtitles/libssf/GlyphPath.h b/...-hc_subs/src/subtitles/libssf/GlyphPath.h → ...-hc_subs/src/subtitles/libssf/GlyphPath.h
diff --git a/...mpc-hc_subs/src/subtitles/libssf/Node.cpp → ...mpc-hc_subs/src/subtitles/libssf/Node.cpp b/...mpc-hc_subs/src/subtitles/libssf/Node.cpp → ...mpc-hc_subs/src/subtitles/libssf/Node.cpp
diff --git a/...p/mpc-hc_subs/src/subtitles/libssf/Node.h → ...s/mpc-hc_subs/src/subtitles/libssf/Node.h b/...p/mpc-hc_subs/src/subtitles/libssf/Node.h → ...s/mpc-hc_subs/src/subtitles/libssf/Node.h
diff --git a/...subs/src/subtitles/libssf/NodeFactory.cpp → ...subs/src/subtitles/libssf/NodeFactory.cpp b/...subs/src/subtitles/libssf/NodeFactory.cpp → ...subs/src/subtitles/libssf/NodeFactory.cpp
diff --git a/...c_subs/src/subtitles/libssf/NodeFactory.h → ...c_subs/src/subtitles/libssf/NodeFactory.h b/...c_subs/src/subtitles/libssf/NodeFactory.h → ...c_subs/src/subtitles/libssf/NodeFactory.h
diff --git a/..._subs/src/subtitles/libssf/Rasterizer.cpp → ..._subs/src/subtitles/libssf/Rasterizer.cpp b/..._subs/src/subtitles/libssf/Rasterizer.cpp → ..._subs/src/subtitles/libssf/Rasterizer.cpp
diff --git a/...hc_subs/src/subtitles/libssf/Rasterizer.h → ...hc_subs/src/subtitles/libssf/Rasterizer.h b/...hc_subs/src/subtitles/libssf/Rasterizer.h → ...hc_subs/src/subtitles/libssf/Rasterizer.h
diff --git a/...hc_subs/src/subtitles/libssf/Renderer.cpp → ...hc_subs/src/subtitles/libssf/Renderer.cpp b/...hc_subs/src/subtitles/libssf/Renderer.cpp → ...hc_subs/src/subtitles/libssf/Renderer.cpp
diff --git a/...c-hc_subs/src/subtitles/libssf/Renderer.h → ...c-hc_subs/src/subtitles/libssf/Renderer.h b/...c-hc_subs/src/subtitles/libssf/Renderer.h → ...c-hc_subs/src/subtitles/libssf/Renderer.h
diff --git a/...pc-hc_subs/src/subtitles/libssf/Split.cpp → ...pc-hc_subs/src/subtitles/libssf/Split.cpp b/...pc-hc_subs/src/subtitles/libssf/Split.cpp → ...pc-hc_subs/src/subtitles/libssf/Split.cpp
diff --git a/.../mpc-hc_subs/src/subtitles/libssf/Split.h → .../mpc-hc_subs/src/subtitles/libssf/Split.h b/.../mpc-hc_subs/src/subtitles/libssf/Split.h → .../mpc-hc_subs/src/subtitles/libssf/Split.h
diff --git a/...c-hc_subs/src/subtitles/libssf/Stream.cpp → ...c-hc_subs/src/subtitles/libssf/Stream.cpp b/...c-hc_subs/src/subtitles/libssf/Stream.cpp → ...c-hc_subs/src/subtitles/libssf/Stream.cpp
diff --git a/...mpc-hc_subs/src/subtitles/libssf/Stream.h → ...mpc-hc_subs/src/subtitles/libssf/Stream.h b/...mpc-hc_subs/src/subtitles/libssf/Stream.h → ...mpc-hc_subs/src/subtitles/libssf/Stream.h
diff --git a/...c_subs/src/subtitles/libssf/StringMap.cpp → ...c_subs/src/subtitles/libssf/StringMap.cpp b/...c_subs/src/subtitles/libssf/StringMap.cpp → ...c_subs/src/subtitles/libssf/StringMap.cpp
diff --git a/...-hc_subs/src/subtitles/libssf/StringMap.h → ...-hc_subs/src/subtitles/libssf/StringMap.h b/...-hc_subs/src/subtitles/libssf/StringMap.h → ...-hc_subs/src/subtitles/libssf/StringMap.h
diff --git a/...hc_subs/src/subtitles/libssf/Subtitle.cpp → ...hc_subs/src/subtitles/libssf/Subtitle.cpp b/...hc_subs/src/subtitles/libssf/Subtitle.cpp → ...hc_subs/src/subtitles/libssf/Subtitle.cpp
diff --git a/...c-hc_subs/src/subtitles/libssf/Subtitle.h → ...c-hc_subs/src/subtitles/libssf/Subtitle.h b/...c-hc_subs/src/subtitles/libssf/Subtitle.h → ...c-hc_subs/src/subtitles/libssf/Subtitle.h
diff --git a/...ubs/src/subtitles/libssf/SubtitleFile.cpp → ...ubs/src/subtitles/libssf/SubtitleFile.cpp b/...ubs/src/subtitles/libssf/SubtitleFile.cpp → ...ubs/src/subtitles/libssf/SubtitleFile.cpp
diff --git a/..._subs/src/subtitles/libssf/SubtitleFile.h → ..._subs/src/subtitles/libssf/SubtitleFile.h b/..._subs/src/subtitles/libssf/SubtitleFile.h → ..._subs/src/subtitles/libssf/SubtitleFile.h
diff --git a/...c_subs/src/subtitles/libssf/demo/demo.ssa → ...c_subs/src/subtitles/libssf/demo/demo.ssa b/...c_subs/src/subtitles/libssf/demo/demo.ssa → ...c_subs/src/subtitles/libssf/demo/demo.ssa
diff --git a/...c_subs/src/subtitles/libssf/demo/demo.ssf → ...c_subs/src/subtitles/libssf/demo/demo.ssf b/...c_subs/src/subtitles/libssf/demo/demo.ssf → ...c_subs/src/subtitles/libssf/demo/demo.ssf
diff --git a/...s/src/subtitles/libssf/docs/ssf-specs.txt → ...s/src/subtitles/libssf/docs/ssf-specs.txt b/...s/src/subtitles/libssf/docs/ssf-specs.txt → ...s/src/subtitles/libssf/docs/ssf-specs.txt
diff --git a/...c_subs/src/subtitles/libssf/libssf.vcproj → ...c_subs/src/subtitles/libssf/libssf.vcproj b/...c_subs/src/subtitles/libssf/libssf.vcproj → ...c_subs/src/subtitles/libssf/libssf.vcproj
@@ -12,9 +12,6 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="x64"
-		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>

diff --git a/..._subs/src/subtitles/libssf/libssf.vcxproj → ..._subs/src/subtitles/libssf/libssf.vcxproj b/..._subs/src/subtitles/libssf/libssf.vcxproj → ..._subs/src/subtitles/libssf/libssf.vcxproj
@@ -74,8 +74,9 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Lib>
       <TargetMachine>MachineX86</TargetMachine>
@@ -100,7 +101,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\..\BaseClasses;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>

diff --git a/...c/subtitles/libssf/libssf.vcxproj.filters → ...c/subtitles/libssf/libssf.vcxproj.filters b/...c/subtitles/libssf/libssf.vcxproj.filters → ...c/subtitles/libssf/libssf.vcxproj.filters
diff --git a/DirectShowFilters/mpc-hc_subs/src/subtitles/libssf/libssf.vcxproj.user b/DirectShowFilters/mpc-hc_subs/src/subtitles/libssf/libssf.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/...c-hc_subs/src/subtitles/libssf/stdafx.cpp → ...c-hc_subs/src/subtitles/libssf/stdafx.cpp b/...c-hc_subs/src/subtitles/libssf/stdafx.cpp → ...c-hc_subs/src/subtitles/libssf/stdafx.cpp
diff --git a/...mpc-hc_subs/src/subtitles/libssf/stdafx.h → ...mpc-hc_subs/src/subtitles/libssf/stdafx.h b/...mpc-hc_subs/src/subtitles/libssf/stdafx.h → ...mpc-hc_subs/src/subtitles/libssf/stdafx.h
diff --git a/....cpp/mpc-hc_subs/src/subtitles/stdafx.cpp → ...ters/mpc-hc_subs/src/subtitles/stdafx.cpp b/....cpp/mpc-hc_subs/src/subtitles/stdafx.cpp → ...ters/mpc-hc_subs/src/subtitles/stdafx.cpp
diff --git a/...re.cpp/mpc-hc_subs/src/subtitles/stdafx.h → ...ilters/mpc-hc_subs/src/subtitles/stdafx.h b/...re.cpp/mpc-hc_subs/src/subtitles/stdafx.h → ...ilters/mpc-hc_subs/src/subtitles/stdafx.h
diff --git a/...c-hc_subs/src/subtitles/subtitles.vcxproj → ...c-hc_subs/src/subtitles/subtitles.vcxproj b/...c-hc_subs/src/subtitles/subtitles.vcxproj → ...c-hc_subs/src/subtitles/subtitles.vcxproj
@@ -74,9 +74,10 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\BaseClasses;..\libpng\;..\zlib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Lib>
       <TargetMachine>MachineX86</TargetMachine>
@@ -100,7 +101,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\BaseClasses;..\libpng\;..\zlib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>

diff --git a/...s/src/subtitles/subtitles.vcxproj.filters → ...s/src/subtitles/subtitles.vcxproj.filters b/...s/src/subtitles/subtitles.vcxproj.filters → ...s/src/subtitles/subtitles.vcxproj.filters
diff --git a/DirectShowFilters/mpc-hc_subs/src/subtitles/subtitles.vcxproj.user b/DirectShowFilters/mpc-hc_subs/src/subtitles/subtitles.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/...hirdparty/VirtualDub/h/vd2/system/Error.h → ...hirdparty/VirtualDub/h/vd2/system/Error.h b/...hirdparty/VirtualDub/h/vd2/system/Error.h → ...hirdparty/VirtualDub/h/vd2/system/Error.h
diff --git a/...irdparty/VirtualDub/h/vd2/system/atomic.h → ...irdparty/VirtualDub/h/vd2/system/atomic.h b/...irdparty/VirtualDub/h/vd2/system/atomic.h → ...irdparty/VirtualDub/h/vd2/system/atomic.h
diff --git a/...dparty/VirtualDub/h/vd2/system/cpuaccel.h → ...dparty/VirtualDub/h/vd2/system/cpuaccel.h b/...dparty/VirtualDub/h/vd2/system/cpuaccel.h → ...dparty/VirtualDub/h/vd2/system/cpuaccel.h
diff --git a/...irdparty/VirtualDub/h/vd2/system/memory.h → ...irdparty/VirtualDub/h/vd2/system/memory.h b/...irdparty/VirtualDub/h/vd2/system/memory.h → ...irdparty/VirtualDub/h/vd2/system/memory.h
diff --git a/...irdparty/VirtualDub/h/vd2/system/thread.h → ...irdparty/VirtualDub/h/vd2/system/thread.h b/...irdparty/VirtualDub/h/vd2/system/thread.h → ...irdparty/VirtualDub/h/vd2/system/thread.h
diff --git a/...rdparty/VirtualDub/h/vd2/system/vdtypes.h → ...rdparty/VirtualDub/h/vd2/system/vdtypes.h b/...rdparty/VirtualDub/h/vd2/system/vdtypes.h → ...rdparty/VirtualDub/h/vd2/system/vdtypes.h
diff --git a/...c/thirdparty/VirtualDub/system/h/stdafx.h → ...c/thirdparty/VirtualDub/system/h/stdafx.h b/...c/thirdparty/VirtualDub/system/h/stdafx.h → ...c/thirdparty/VirtualDub/system/h/stdafx.h
diff --git a/...VirtualDub/system/source/a64_fraction.asm → ...VirtualDub/system/source/a64_fraction.asm b/...VirtualDub/system/source/a64_fraction.asm → ...VirtualDub/system/source/a64_fraction.asm
diff --git a/...y/VirtualDub/system/source/a64_int128.asm → ...y/VirtualDub/system/source/a64_int128.asm b/...y/VirtualDub/system/source/a64_int128.asm → ...y/VirtualDub/system/source/a64_int128.asm
diff --git a/...ty/VirtualDub/system/source/a64_thunk.asm → ...ty/VirtualDub/system/source/a64_thunk.asm b/...ty/VirtualDub/system/source/a64_thunk.asm → ...ty/VirtualDub/system/source/a64_thunk.asm
diff --git a/...rty/VirtualDub/system/source/a_memory.asm → ...rty/VirtualDub/system/source/a_memory.asm b/...rty/VirtualDub/system/source/a_memory.asm → ...rty/VirtualDub/system/source/a_memory.asm
diff --git a/...arty/VirtualDub/system/source/a_thunk.asm → ...arty/VirtualDub/system/source/a_thunk.asm b/...arty/VirtualDub/system/source/a_thunk.asm → ...arty/VirtualDub/system/source/a_thunk.asm
diff --git a/...rty/VirtualDub/system/source/cpuaccel.cpp → ...rty/VirtualDub/system/source/cpuaccel.cpp b/...rty/VirtualDub/system/source/cpuaccel.cpp → ...rty/VirtualDub/system/source/cpuaccel.cpp
diff --git a/...party/VirtualDub/system/source/memory.cpp → ...party/VirtualDub/system/source/memory.cpp b/...party/VirtualDub/system/source/memory.cpp → ...party/VirtualDub/system/source/memory.cpp
diff --git a/...party/VirtualDub/system/source/stdafx.cpp → ...party/VirtualDub/system/source/stdafx.cpp b/...party/VirtualDub/system/source/stdafx.cpp → ...party/VirtualDub/system/source/stdafx.cpp
diff --git a/...irdparty/VirtualDub/system/system.vcxproj → ...irdparty/VirtualDub/system/system.vcxproj b/...irdparty/VirtualDub/system/system.vcxproj → ...irdparty/VirtualDub/system/system.vcxproj
@@ -70,7 +70,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>..\h;.\h;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;_LIB;WIN32;NOMINMAX;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;NDEBUG;_LIB;WIN32;NOMINMAX;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
@@ -119,11 +119,12 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <AdditionalIncludeDirectories>../h;.\h;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;_LIB;WIN32;NOMINMAX;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_AFXDLL;_DEBUG;_LIB;WIN32;NOMINMAX;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

diff --git a/.../VirtualDub/system/system.vcxproj.filters → .../VirtualDub/system/system.vcxproj.filters b/.../VirtualDub/system/system.vcxproj.filters → .../VirtualDub/system/system.vcxproj.filters
diff --git a/DirectShowFilters/mpc-hc_subs/src/thirdparty/VirtualDub/system/system.vcxproj.user b/DirectShowFilters/mpc-hc_subs/src/thirdparty/VirtualDub/system/system.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/mediaportal/Core.cpp/Core.cpp.sln b/mediaportal/Core.cpp/Core.cpp.sln
diff --git a/mediaportal/Core.cpp/alloctracing.h b/mediaportal/Core.cpp/alloctracing.h