updates for x64

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@539 10f7b99b-c216-0410-bff0-8a66a9350fd8

63 files changed, 329 insertions, 294 deletions

diff --git a/mpc-hc.sln b/mpc-hc.sln
index 56cc0433d..41a1168b7 100644
--- a/mpc-hc.sln
+++ b/mpc-hc.sln
@@ -362,7 +362,6 @@ Global
 		{83CC6B88-A112-4192-BD5A-F2A249AF2277}.Debug Unicode|Win32.ActiveCfg = Debug Unicode lib|Win32

 		{83CC6B88-A112-4192-BD5A-F2A249AF2277}.Debug Unicode|Win32.Build.0 = Debug Unicode lib|Win32

 		{83CC6B88-A112-4192-BD5A-F2A249AF2277}.Debug Unicode|x64.ActiveCfg = Debug Unicode lib|x64

-		{83CC6B88-A112-4192-BD5A-F2A249AF2277}.Debug Unicode|x64.Build.0 = Debug Unicode lib|x64

 		{83CC6B88-A112-4192-BD5A-F2A249AF2277}.Release Unicode|Win32.ActiveCfg = Release Unicode lib|Win32

 		{83CC6B88-A112-4192-BD5A-F2A249AF2277}.Release Unicode|Win32.Build.0 = Release Unicode lib|Win32

 		{83CC6B88-A112-4192-BD5A-F2A249AF2277}.Release Unicode|x64.ActiveCfg = Release Unicode lib|x64

@@ -501,6 +500,7 @@ Global
 		{305BAB2D-0D75-4FBC-8BCD-A2917392B48C}.Release Unicode|Win32.ActiveCfg = Release Unicode lib|Win32

 		{305BAB2D-0D75-4FBC-8BCD-A2917392B48C}.Release Unicode|Win32.Build.0 = Release Unicode lib|Win32

 		{305BAB2D-0D75-4FBC-8BCD-A2917392B48C}.Release Unicode|x64.ActiveCfg = Release Unicode lib|x64

+		{305BAB2D-0D75-4FBC-8BCD-A2917392B48C}.Release Unicode|x64.Build.0 = Release Unicode lib|x64

 		{4421516D-10A6-41C1-ADF3-099573BBB0C6}.Debug Unicode|Win32.ActiveCfg = Debug Unicode lib|Win32

 		{4421516D-10A6-41C1-ADF3-099573BBB0C6}.Debug Unicode|Win32.Build.0 = Debug Unicode lib|Win32

 		{4421516D-10A6-41C1-ADF3-099573BBB0C6}.Debug Unicode|x64.ActiveCfg = Debug Unicode lib|x64

diff --git a/src/apps/mplayerc/mplayerc.vcproj b/src/apps/mplayerc/mplayerc.vcproj
index db14dca7f..64d812437 100644
--- a/src/apps/mplayerc/mplayerc.vcproj
+++ b/src/apps/mplayerc/mplayerc.vcproj
@@ -136,7 +136,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\include;..\..\zlib"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;DETOURS_X64"

+				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;DETOURS_X64"

 				PrecompiledHeaderThrough="stdafx.h"

 				PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"

 			/>

@@ -154,11 +154,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib dxguid.lib Dsound.lib strmbaseRU.lib dsutilRU.lib subpicRU.lib subtitlesRU.lib libssfRU.lib asyncreaderRU.lib audioswitcherRU.lib avi2ac3filterRU.lib bufferfilterRU.lib cddareaderRU.lib cdxareaderRU.lib decssfilterRU.lib flicsourceRU.lib dtsac3sourceRU.lib basesourceRU.lib wavdestRU.lib shoutcastsourceRU.lib streamdrivethruRU.lib vtsreaderRU.lib basesplitterRU.lib MatroskaSplitterRU.lib MatroskaMuxerRU.lib RealMediaSplitterRU.lib AviSplitterRU.lib MpaDecFilterRU.lib RoQSplitterRU.lib OggSplitterRU.lib NutSplitterRU.lib MpegSplitterRU.lib DiracSplitterRU.lib MpaSplitterRU.lib DSMSplitterRU.lib BaseMuxerRU.lib DSMMuxerRU.lib UDPReaderRU.lib FLVSplitterRU.lib zlibR.lib subtitlesourceRU.lib filtersRU.lib libvorbisidecR.lib SSFSplitterRU.lib MP4SplitterRU.lib libpngR.lib Setupapi.lib lgLcd.lib libLCDUIRU.lib Uuid.Lib strmiids.lib MPCVideoDecRU.lib"

-				ShowProgress="2"

+				AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib dxguid.lib Dsound.lib strmbaseRU.lib dsutilRU.lib subpicRU.lib subtitlesRU.lib libssfRU.lib asyncreaderRU.lib audioswitcherRU.lib avi2ac3filterRU.lib bufferfilterRU.lib cddareaderRU.lib cdxareaderRU.lib decssfilterRU.lib flicsourceRU.lib dtsac3sourceRU.lib basesourceRU.lib wavdestRU.lib shoutcastsourceRU.lib streamdrivethruRU.lib vtsreaderRU.lib basesplitterRU.lib MatroskaSplitterRU.lib MatroskaMuxerRU.lib RealMediaSplitterRU.lib AviSplitterRU.lib MpaDecFilterRU.lib RoQSplitterRU.lib OggSplitterRU.lib NutSplitterRU.lib MpegSplitterRU.lib DiracSplitterRU.lib MpaSplitterRU.lib DSMSplitterRU.lib BaseMuxerRU.lib DSMMuxerRU.lib UDPReaderRU.lib FLVSplitterRU.lib zlibR.lib subtitlesourceRU.lib filtersRU.lib libvorbisidecR.lib SSFSplitterRU.lib MP4SplitterRU.lib libpngR.lib Setupapi.lib lgLcd.lib libLCDUIRU.lib Uuid.Lib strmiids.lib MPCVideoDecRU.lib Mpeg2DecFilterRU.lib"

+				ShowProgress="1"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

 				AdditionalLibraryDirectories="..\..\..\lib64;..\..\..\lib64\lglcd"

-				IgnoreDefaultLibraryNames="MSVCRT"

+				IgnoreDefaultLibraryNames=""

 				DelayLoadDLLs="d3d9.dll;msimg32.dll;gdiplus.dll;psapi.dll"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

@@ -305,7 +305,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\include;..\..\zlib"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;DETOURS_X64"

+				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;DETOURS_X64"

 				PrecompiledHeaderThrough="stdafx.h"

 				PrecompiledHeaderFile="$(OutDir)\$(ProjectName).pch"

 				DebugInformationFormat="3"

@@ -323,10 +323,10 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib Dsound.lib dxguid.lib strmbaseDU.lib dsutilDU.lib subpicDU.lib subtitlesDU.lib libssfDU.lib asyncreaderDU.lib audioswitcherDU.lib avi2ac3filterDU.lib bufferfilterDU.lib cddareaderDU.lib cdxareaderDU.lib decssfilterDU.lib flicsourceDU.lib dtsac3sourceDU.lib basesourceDU.lib subtitlesourceDU.lib wavdestDU.lib shoutcastsourceDU.lib streamdrivethruDU.lib vtsreaderDU.lib basesplitterDU.lib MatroskaSplitterDU.lib MatroskaMuxerDU.lib RealMediaSplitterDU.lib AviSplitterDU.lib MpaDecFilterDU.lib RoQSplitterDU.lib OggSplitterDU.lib NutSplitterDU.lib MpegSplitterDU.lib DiracSplitterDU.lib MpaSplitterDU.lib DSMSplitterDU.lib BaseMuxerDU.lib DSMMuxerDU.lib UDPReaderDU.lib FLVSplitterDU.lib zlibD.lib filtersDU.lib libvorbisidecD.lib SSFSplitterDU.lib MP4SplitterDU.lib libpngD.lib Setupapi.lib lgLcd.lib libLCDUIDU.lib strmiids.lib MPCVideoDecDU.lib"

+				AdditionalDependencies="comsuppw.lib Delayimp.lib psapi.lib Dsound.lib dxguid.lib strmbaseDU.lib dsutilDU.lib subpicDU.lib subtitlesDU.lib libssfDU.lib asyncreaderDU.lib audioswitcherDU.lib avi2ac3filterDU.lib bufferfilterDU.lib cddareaderDU.lib cdxareaderDU.lib decssfilterDU.lib flicsourceDU.lib dtsac3sourceDU.lib basesourceDU.lib subtitlesourceDU.lib wavdestDU.lib shoutcastsourceDU.lib streamdrivethruDU.lib vtsreaderDU.lib basesplitterDU.lib MatroskaSplitterDU.lib MatroskaMuxerDU.lib RealMediaSplitterDU.lib AviSplitterDU.lib MpaDecFilterDU.lib RoQSplitterDU.lib OggSplitterDU.lib NutSplitterDU.lib MpegSplitterDU.lib DiracSplitterDU.lib MpaSplitterDU.lib DSMSplitterDU.lib BaseMuxerDU.lib DSMMuxerDU.lib UDPReaderDU.lib FLVSplitterDU.lib zlibD.lib filtersDU.lib libvorbisidecD.lib SSFSplitterDU.lib MP4SplitterDU.lib libpngD.lib Setupapi.lib lgLcd.lib libLCDUIDU.lib strmiids.lib MPCVideoDecDU.lib Mpeg2DecFilterRU.lib"

 				OutputFile="$(OutDir)\$(ProjectName).exe"

 				AdditionalLibraryDirectories="..\..\..\lib64;..\..\..\lib64\lglcd"

-				IgnoreDefaultLibraryNames="MSVCRT;LIBCMT"

+				IgnoreDefaultLibraryNames=""

 				DelayLoadDLLs="d3d9.dll;msimg32.dll;gdiplus.dll;psapi.dll"

 				SubSystem="2"

 				RandomizedBaseAddress="1"

diff --git a/src/decss/decss.vcproj b/src/decss/decss.vcproj
index 3f99c2d0b..97e55da7c 100644
--- a/src/decss/decss.vcproj
+++ b/src/decss/decss.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/dsutil/dsutil.vcproj b/src/dsutil/dsutil.vcproj
index 566a26138..700e09918 100644
--- a/src/dsutil/dsutil.vcproj
+++ b/src/dsutil/dsutil.vcproj
@@ -104,7 +104,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

 				Detect64BitPortabilityProblems="false"

 				DebugInformationFormat="3"

 			/>

@@ -224,7 +224,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/BaseClasses/baseclasses.vcproj b/src/filters/BaseClasses/baseclasses.vcproj
index 4fa251747..8af514d2d 100644
--- a/src/filters/BaseClasses/baseclasses.vcproj
+++ b/src/filters/BaseClasses/baseclasses.vcproj
@@ -114,7 +114,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -246,7 +246,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="2"

 				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

diff --git a/src/filters/filters.vcproj b/src/filters/filters.vcproj
index aac5eef28..66c91f000 100644
--- a/src/filters/filters.vcproj
+++ b/src/filters/filters.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/muxer/basemuxer/BaseMuxer.vcproj b/src/filters/muxer/basemuxer/BaseMuxer.vcproj
index f61bde9ae..f82d94558 100644
--- a/src/filters/muxer/basemuxer/BaseMuxer.vcproj
+++ b/src/filters/muxer/basemuxer/BaseMuxer.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj b/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj
index b59d60446..1c8290f1a 100644
--- a/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj
+++ b/src/filters/muxer/dsmmuxer/DSMMuxer.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj b/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj
index 674ab2892..a8a4adf9c 100644
--- a/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj
+++ b/src/filters/muxer/matroskamuxer/MatroskaMuxer.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/muxer/wavdest/wavdest.vcproj b/src/filters/muxer/wavdest/wavdest.vcproj
index 0ab5b85ec..0d9a5f5f2 100644
--- a/src/filters/muxer/wavdest/wavdest.vcproj
+++ b/src/filters/muxer/wavdest/wavdest.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/avisplitter/AviSplitter.vcproj b/src/filters/parser/avisplitter/AviSplitter.vcproj
index 98c012e19..1267a0069 100644
--- a/src/filters/parser/avisplitter/AviSplitter.vcproj
+++ b/src/filters/parser/avisplitter/AviSplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/basesplitter/basesplitter.vcproj b/src/filters/parser/basesplitter/basesplitter.vcproj
index 842ef67d6..370c88f5b 100644
--- a/src/filters/parser/basesplitter/basesplitter.vcproj
+++ b/src/filters/parser/basesplitter/basesplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/diracsplitter/DiracSplitter.vcproj b/src/filters/parser/diracsplitter/DiracSplitter.vcproj
index 591ceedcd..ff9fa8d5f 100644
--- a/src/filters/parser/diracsplitter/DiracSplitter.vcproj
+++ b/src/filters/parser/diracsplitter/DiracSplitter.vcproj
@@ -104,7 +104,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -223,7 +223,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories=".\libdirac;..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/diracsplitter/libdirac/libdirac.vcproj b/src/filters/parser/diracsplitter/libdirac/libdirac.vcproj
index 26999b0c1..9c6e872bd 100644
--- a/src/filters/parser/diracsplitter/libdirac/libdirac.vcproj
+++ b/src/filters/parser/diracsplitter/libdirac/libdirac.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				UsePrecompiledHeader="0"

 				DebugInformationFormat="3"

 			/>

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_MMX"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;HAVE_MMX"

 				UsePrecompiledHeader="0"

 			/>

 			<Tool

diff --git a/src/filters/parser/dsmsplitter/DSMSplitter.vcproj b/src/filters/parser/dsmsplitter/DSMSplitter.vcproj
index 2ac6562b4..6b81bb95a 100644
--- a/src/filters/parser/dsmsplitter/DSMSplitter.vcproj
+++ b/src/filters/parser/dsmsplitter/DSMSplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/flvsplitter/FLVSplitter.vcproj b/src/filters/parser/flvsplitter/FLVSplitter.vcproj
index 91d5a30a0..5fba6430f 100644
--- a/src/filters/parser/flvsplitter/FLVSplitter.vcproj
+++ b/src/filters/parser/flvsplitter/FLVSplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj b/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj
index 28f4cf1cc..876d086aa 100644
--- a/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj
+++ b/src/filters/parser/matroskasplitter/MatroskaSplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/mp4splitter/MP4Splitter.vcproj b/src/filters/parser/mp4splitter/MP4Splitter.vcproj
index 0a7dc1aa2..adb14f7a6 100644
--- a/src/filters/parser/mp4splitter/MP4Splitter.vcproj
+++ b/src/filters/parser/mp4splitter/MP4Splitter.vcproj
@@ -104,7 +104,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 				DisableSpecificWarnings="4812"

 			/>

@@ -222,7 +222,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories=".\AP4\Source\Core;.\AP4\Source\Config;.\AP4\Source\Crypto;..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 				DisableSpecificWarnings="4812"

 			/>

 			<Tool

diff --git a/src/filters/parser/mpasplitter/MpaSplitter.vcproj b/src/filters/parser/mpasplitter/MpaSplitter.vcproj
index a7464be74..867a09bbe 100644
--- a/src/filters/parser/mpasplitter/MpaSplitter.vcproj
+++ b/src/filters/parser/mpasplitter/MpaSplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/mpegsplitter/MpegSplitter.vcproj b/src/filters/parser/mpegsplitter/MpegSplitter.vcproj
index 92a8e5c91..3e63c1650 100644
--- a/src/filters/parser/mpegsplitter/MpegSplitter.vcproj
+++ b/src/filters/parser/mpegsplitter/MpegSplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/nutsplitter/NutSplitter.vcproj b/src/filters/parser/nutsplitter/NutSplitter.vcproj
index a77d96c2f..8fc65f0f3 100644
--- a/src/filters/parser/nutsplitter/NutSplitter.vcproj
+++ b/src/filters/parser/nutsplitter/NutSplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/oggsplitter/OggSplitter.vcproj b/src/filters/parser/oggsplitter/OggSplitter.vcproj
index dc8b7416e..e3cc580f2 100644
--- a/src/filters/parser/oggsplitter/OggSplitter.vcproj
+++ b/src/filters/parser/oggsplitter/OggSplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj b/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj
index 90fad1d32..0b0636cf9 100644
--- a/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj
+++ b/src/filters/parser/realmediasplitter/RealMediaSplitter.vcproj
@@ -105,7 +105,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -226,7 +226,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/roqsplitter/RoQSplitter.vcproj b/src/filters/parser/roqsplitter/RoQSplitter.vcproj
index f5557863f..6d5c158db 100644
--- a/src/filters/parser/roqsplitter/RoQSplitter.vcproj
+++ b/src/filters/parser/roqsplitter/RoQSplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/ssfsplitter/SSFSplitter.vcproj b/src/filters/parser/ssfsplitter/SSFSplitter.vcproj
index 9f6d6dd1b..b573f7182 100644
--- a/src/filters/parser/ssfsplitter/SSFSplitter.vcproj
+++ b/src/filters/parser/ssfsplitter/SSFSplitter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/parser/streamdrivethru/streamdrivethru.vcproj b/src/filters/parser/streamdrivethru/streamdrivethru.vcproj
index 13087705d..1cfea6fe7 100644
--- a/src/filters/parser/streamdrivethru/streamdrivethru.vcproj
+++ b/src/filters/parser/streamdrivethru/streamdrivethru.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/reader/asyncreader/asyncreader.vcproj b/src/filters/reader/asyncreader/asyncreader.vcproj
index c95200d20..2a8781ba8 100644
--- a/src/filters/reader/asyncreader/asyncreader.vcproj
+++ b/src/filters/reader/asyncreader/asyncreader.vcproj
@@ -99,7 +99,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -212,7 +212,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/reader/cddareader/cddareader.vcproj b/src/filters/reader/cddareader/cddareader.vcproj
index 9671a9d51..da4de0139 100644
--- a/src/filters/reader/cddareader/cddareader.vcproj
+++ b/src/filters/reader/cddareader/cddareader.vcproj
@@ -387,7 +387,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -504,7 +504,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/reader/cdxareader/cdxareader.vcproj b/src/filters/reader/cdxareader/cdxareader.vcproj
index 9bccb5a2c..e89108206 100644
--- a/src/filters/reader/cdxareader/cdxareader.vcproj
+++ b/src/filters/reader/cdxareader/cdxareader.vcproj
@@ -387,7 +387,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -504,7 +504,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/reader/udpreader/UDPReader.vcproj b/src/filters/reader/udpreader/UDPReader.vcproj
index f6bac4107..8cd35e29f 100644
--- a/src/filters/reader/udpreader/UDPReader.vcproj
+++ b/src/filters/reader/udpreader/UDPReader.vcproj
@@ -102,7 +102,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				UsePrecompiledHeader="2"

 				DebugInformationFormat="3"

 			/>

@@ -219,7 +219,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 				UsePrecompiledHeader="2"

 			/>

 			<Tool

diff --git a/src/filters/reader/vtsreader/vtsreader.vcproj b/src/filters/reader/vtsreader/vtsreader.vcproj
index fcae6569e..d3dd89671 100644
--- a/src/filters/reader/vtsreader/vtsreader.vcproj
+++ b/src/filters/reader/vtsreader/vtsreader.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/source/basesource/basesource.vcproj b/src/filters/source/basesource/basesource.vcproj
index 2d2210517..51487f139 100644
--- a/src/filters/source/basesource/basesource.vcproj
+++ b/src/filters/source/basesource/basesource.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/source/d2vsource/d2vsource.vcproj b/src/filters/source/d2vsource/d2vsource.vcproj
index 2caf06e48..9d95273f9 100644
--- a/src/filters/source/d2vsource/d2vsource.vcproj
+++ b/src/filters/source/d2vsource/d2vsource.vcproj
@@ -382,7 +382,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -497,7 +497,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/source/dtsac3source/dtsac3source.vcproj b/src/filters/source/dtsac3source/dtsac3source.vcproj
index 596832cbe..ebd3168ba 100644
--- a/src/filters/source/dtsac3source/dtsac3source.vcproj
+++ b/src/filters/source/dtsac3source/dtsac3source.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/source/flicsource/flicsource.vcproj b/src/filters/source/flicsource/flicsource.vcproj
index 914f20cba..c8151ef99 100644
--- a/src/filters/source/flicsource/flicsource.vcproj
+++ b/src/filters/source/flicsource/flicsource.vcproj
@@ -382,7 +382,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -497,7 +497,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/source/shoutcastsource/shoutcastsource.vcproj b/src/filters/source/shoutcastsource/shoutcastsource.vcproj
index 075034998..497f916af 100644
--- a/src/filters/source/shoutcastsource/shoutcastsource.vcproj
+++ b/src/filters/source/shoutcastsource/shoutcastsource.vcproj
@@ -388,7 +388,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -505,7 +505,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/source/subtitlesource/subtitlesource.vcproj b/src/filters/source/subtitlesource/subtitlesource.vcproj
index 3ae3538df..2afe360ea 100644
--- a/src/filters/source/subtitlesource/subtitlesource.vcproj
+++ b/src/filters/source/subtitlesource/subtitlesource.vcproj
@@ -388,7 +388,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -505,7 +505,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/switcher/audioswitcher/audioswitcher.vcproj b/src/filters/switcher/audioswitcher/audioswitcher.vcproj
index bb748c11f..d863a4874 100644
--- a/src/filters/switcher/audioswitcher/audioswitcher.vcproj
+++ b/src/filters/switcher/audioswitcher/audioswitcher.vcproj
@@ -392,7 +392,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -509,7 +509,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj b/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj
index 963415dab..431d5ed05 100644
--- a/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj
+++ b/src/filters/transform/avi2ac3filter/avi2ac3filter.vcproj
@@ -388,7 +388,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -505,7 +505,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/transform/basevideofilter/basevideofilter.vcproj b/src/filters/transform/basevideofilter/basevideofilter.vcproj
index 3600bf195..41892f9cb 100644
--- a/src/filters/transform/basevideofilter/basevideofilter.vcproj
+++ b/src/filters/transform/basevideofilter/basevideofilter.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/transform/bufferfilter/bufferfilter.vcproj b/src/filters/transform/bufferfilter/bufferfilter.vcproj
index e703d539b..bc8eaefd7 100644
--- a/src/filters/transform/bufferfilter/bufferfilter.vcproj
+++ b/src/filters/transform/bufferfilter/bufferfilter.vcproj
@@ -382,7 +382,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -497,7 +497,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/transform/decssfilter/decssfilter.vcproj b/src/filters/transform/decssfilter/decssfilter.vcproj
index ebf4b0fd3..60d6d8c5f 100644
--- a/src/filters/transform/decssfilter/decssfilter.vcproj
+++ b/src/filters/transform/decssfilter/decssfilter.vcproj
@@ -382,7 +382,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -497,7 +497,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj b/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj
index e6e6e7dec..638d61dd6 100644
--- a/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj
+++ b/src/filters/transform/mpadecfilter/MpaDecFilter.vcproj
@@ -389,7 +389,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -510,7 +510,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52.vcproj b/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52.vcproj
index 4f23e51dc..8216607b4 100644
--- a/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52.vcproj
+++ b/src/filters/transform/mpadecfilter/a52dec-0.7.4/vc++/liba52.vcproj
@@ -109,7 +109,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories=".,../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 				PrecompiledHeaderFile=".\Release\liba52.pch"

 				CompileAs="0"

 			/>

@@ -236,7 +236,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories=".,../include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				GeneratePreprocessedFile="0"

 				PrecompiledHeaderFile=".\Debug\liba52.pch"

 				AssemblerOutput="0"

diff --git a/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts.vcproj b/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts.vcproj
index 66210c16f..6525dc60a 100644
--- a/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts.vcproj
+++ b/src/filters/transform/mpadecfilter/dtsdec-0.0.1/vc++/libdts.vcproj
@@ -108,7 +108,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories=".,../include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				PrecompiledHeaderFile=".\Debug\libdts.pch"

 				DebugInformationFormat="3"

 				CompileAs="0"

diff --git a/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj b/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj
index 1a24dea3e..9c58afe71 100644
--- a/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj
+++ b/src/filters/transform/mpadecfilter/faad2/libfaad/libfaad.vcproj
@@ -109,7 +109,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions=""

-				PreprocessorDefinitions="NDEBUG;WIN32;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 				PrecompiledHeaderFile=".\Release\libfaad.pch"

 			/>

 			<Tool

@@ -234,7 +234,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions=""

-				PreprocessorDefinitions="_DEBUG;WIN32;_LIB"

+				PreprocessorDefinitions="WIN64;_LIB;_DEBUG"

 				PrecompiledHeaderFile=".\Debug\libfaad.pch"

 				DebugInformationFormat="3"

 			/>

diff --git a/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad.vcproj b/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad.vcproj
index 76b4dcaa6..dc374f0be 100644
--- a/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad.vcproj
+++ b/src/filters/transform/mpadecfilter/libmad-0.15.0b/msvc++/libmad.vcproj
@@ -110,7 +110,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="FPM_DEFAULT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK;WIN32;_DEBUG;DEBUG"

+				PreprocessorDefinitions="FPM_DEFAULT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK;WIN64;_DEBUG;DEBUG"

 				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\Debug\libmad.pch"

 				AssemblerOutput="0"

@@ -240,7 +240,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="NDEBUG;FPM_INTEL;FPM_64BIT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK"

+				PreprocessorDefinitions="WIN64;NDEBUG;FPM_INTEL;FPM_64BIT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK"

 				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\Release\libmad.pch"

 				CompileAs="0"

diff --git a/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec.vcproj b/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec.vcproj
index b1ed95ba0..6b8fca65f 100644
--- a/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec.vcproj
+++ b/src/filters/transform/mpadecfilter/libvorbisidec/libvorbisidec.vcproj
@@ -110,7 +110,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="_LIB;_WIN32;WIN32;_DEBUG;DEBUG"

+				PreprocessorDefinitions="WIN64;_LIB;_DEBUG;DEBUG"

 				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\Debug\libvorbisidec.pch"

 				AssemblerOutput="0"

@@ -240,7 +240,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="_LIB;_WIN32;WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;_LIB;NDEBUG"

 				UsePrecompiledHeader="0"

 				PrecompiledHeaderFile=".\Release\libvorbisidec.pch"

 				CompileAs="0"

diff --git a/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj b/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj
index 1c34e3d02..17e66fcb5 100644
--- a/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj
+++ b/src/filters/transform/mpcvideodec/MPCVideoDec.vcproj
@@ -384,7 +384,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include,ffmpeg,ffmpeg\libavcodec,ffmpeg\libavutil"

-				PreprocessorDefinitions="WIN32;_DEBUG;"

+				PreprocessorDefinitions="WIN64;_DEBUG;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -504,7 +504,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include,ffmpeg,ffmpeg\libavcodec,ffmpeg\libavutil"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.vcproj b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.vcproj
index 0d814a831..210885ba9 100644
--- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.vcproj
+++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec.vcproj
@@ -273,7 +273,7 @@
 			ConfigurationType="4"

 			UseOfMFC="1"

 			ATLMinimizesCRunTimeLibraryUsage="false"

-			WholeProgramOptimization="1"

+			WholeProgramOptimization="0"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -297,10 +297,12 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

+				Optimization="3"

 				InlineFunctionExpansion="2"

 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

 				OmitFramePointers="true"

+				WholeProgramOptimization="false"

 				AdditionalIncludeDirectories="..\..\..\..\zlib,.,libavcodec,libavutil"

 				PreprocessorDefinitions="WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_CRT_NONSTDC_NO_WARNINGS;NDEBUG;_WINDOWS;HAVE_AV_CONFIG_H"

 				StringPooling="true"

@@ -308,6 +310,7 @@
 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

+				EnableEnhancedInstructionSet="0"

 				AssemblerListingLocation="$(IntDir)\"

 				ObjectFile="$(IntDir)\"

 				ProgramDataBaseFileName="$(IntDir)\"

@@ -765,10 +768,6 @@
 				>

 			</File>

 			<File

-				RelativePath=".\libavcodec\mpeg4audio.h"

-				>

-			</File>

-			<File

 				RelativePath=".\libavcodec\mpeg4video_parser.c"

 				>

 			</File>

@@ -1690,6 +1689,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\libavformat\avi.h"

+				>

+			</File>

+			<File

 				RelativePath=".\libavformat\avio.c"

 				>

 			</File>

@@ -1714,6 +1717,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\libavformat\flv.h"

+				>

+			</File>

+			<File

 				RelativePath=".\libavformat\matroska.c"

 				>

 			</File>

@@ -1742,40 +1749,16 @@
 				>

 			</File>

 			<File

+				RelativePath=".\libavformat\mpjpeg.c"

+				>

+			</File>

+			<File

+				RelativePath=".\libavformat\os_support.h"

+				>

+			</File>

+			<File

 				RelativePath=".\libavformat\raw.c"

 				>

-				<FileConfiguration

-					Name="Debug|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)\"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Debug|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)\"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)\"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)\"

-					/>

-				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\libavformat\raw.h"

@@ -1790,6 +1773,14 @@
 				>

 			</File>

 			<File

+				RelativePath=".\libavformat\rtp.h"

+				>

+			</File>

+			<File

+				RelativePath=".\libavformat\rtp_internal.h"

+				>

+			</File>

+			<File

 				RelativePath=".\libavformat\utils.c"

 				>

 				<FileConfiguration

@@ -1797,7 +1788,8 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)\utilsformat.obj"

+						ObjectFile="$(IntDir)\$(InputName)1.obj"

+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1805,7 +1797,8 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)\utilsformat.obj"

+						ObjectFile="$(IntDir)\$(InputName)1.obj"

+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1813,7 +1806,8 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)\utilsformat.obj"

+						ObjectFile="$(IntDir)\$(InputName)1.obj"

+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"

 					/>

 				</FileConfiguration>

 				<FileConfiguration

@@ -1821,7 +1815,8 @@
 					>

 					<Tool

 						Name="VCCLCompilerTool"

-						ObjectFile="$(IntDir)\utilsformat.obj"

+						ObjectFile="$(IntDir)\$(InputName)1.obj"

+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"

 					/>

 				</FileConfiguration>

 			</File>

diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/allcodecs.c b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/allcodecs.c
index 26010959b..eca729b6d 100644
--- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/allcodecs.c
+++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec/allcodecs.c
@@ -53,136 +53,136 @@ void avcodec_register_all(void)
     initialized = 1;

 

     /* video codecs */

-//    REGISTER_DECODER    (aasc);

-    REGISTER_DECODER  (amv);

-//    REGISTER_DECODER    (asv1);

-//    REGISTER_DECODER    (asv2);

-//    REGISTER_DECODER    (avs);

-//    REGISTER_DECODER    (cavs);

-//    REGISTER_DECODER    (cinepak);

-//    REGISTER_DECODER    (cscd);

-//    REGISTER_DECODER    (corepng);

-//    REGISTER_DECODER    (cyuv);

-//    REGISTER_DECODER    (dvvideo);

-//    REGISTER_DECODER    (eightbps);

-//    REGISTER_DECODER      (ffv1);

-//    REGISTER_DECODER      (ffvhuff);

-    REGISTER_DECODER  (flv);

-//    REGISTER_DECODER    (fraps);

-//    REGISTER_DECODER        (h261);

-    REGISTER_DECODER  (h263);

-    REGISTER_DECODER  (h263i);

-    REGISTER_DECODER  (h264);

-//    REGISTER_DECODER    (huffyuv);

-//    REGISTER_DECODER    (indeo2);

-//    REGISTER_DECODER    (indeo3);

-//    REGISTER_DECODER    (jpegls);

-//    REGISTER_ENCODER    (ljpeg);

-//    REGISTER_DECODER    (loco);

-//    REGISTER_DECODER    (mjpeg);

-//    REGISTER_DECODER    (mjpegb);

-//    REGISTER_DECODER    (mpeg1video);

-//    REGISTER_DECODER    (mpeg2video);

-    REGISTER_DECODER  (mpeg4);

-    REGISTER_DECODER  (mpegvideo);

-    REGISTER_DECODER  (msmpeg4v1);

-    REGISTER_DECODER  (msmpeg4v2);

-    REGISTER_DECODER  (msmpeg4v3);

-//    REGISTER_DECODER    (msrle);

-//    REGISTER_DECODER    (msvideo1);

-//    REGISTER_DECODER    (mszh);

-//    #ifdef CONFIG_ZLIB

-//    REGISTER_ENCDEC        (png);

-//    #endif

-//    REGISTER_DECODER    (qpeg);

-//    REGISTER_DECODER    (qtrle);

-//    REGISTER_DECODER    (rpza);

-//    REGISTER_DECODER    (rv10);

-//    REGISTER_DECODER    (rv20);

-//    #if __STDC_VERSION__ >= 199901L

-//    REGISTER_ENCDEC        (snow);

-//    #endif

-    REGISTER_DECODER  (svq1);

-    REGISTER_DECODER  (svq3);

-    REGISTER_DECODER  (theora);

-//    REGISTER_DECODER    (truemotion1);

-//    REGISTER_DECODER    (truemotion2);

-//    REGISTER_DECODER    (tscc);

-//    REGISTER_DECODER    (ulti);

-    REGISTER_DECODER  (vc1);

-//    REGISTER_DECODER    (vcr1);

-//    REGISTER_DECODER    (vp3);

-    REGISTER_DECODER  (vp5);

-    REGISTER_DECODER  (vp6);

-    REGISTER_DECODER  (vp6a);

-    REGISTER_DECODER  (vp6f);

-    REGISTER_DECODER  (wmv1);

-    REGISTER_DECODER  (wmv2);

-    REGISTER_DECODER  (wmv3);

-//    REGISTER_DECODER    (wnv1);

-//    REGISTER_DECODER    (xl);

-//    REGISTER_DECODER    (zlib);

-//    REGISTER_DECODER    (zmbv);

+//REGISTER_DECODER    (aasc);

+ REGISTER_DECODER  (amv);

+//REGISTER_DECODER    (asv1);

+//REGISTER_DECODER    (asv2);

+//REGISTER_DECODER    (avs);

+//REGISTER_DECODER    (cavs);

+//REGISTER_DECODER    (cinepak);

+//REGISTER_DECODER    (cscd);

+//REGISTER_DECODER    (corepng);

+//REGISTER_DECODER    (cyuv);

+//REGISTER_DECODER    (dvvideo);

+//REGISTER_DECODER    (eightbps);

+//REGISTER_DECODER      (ffv1);

+//REGISTER_DECODER      (ffvhuff);

+ REGISTER_DECODER  (flv);

+//REGISTER_DECODER    (fraps);

+//REGISTER_DECODER        (h261);

+ REGISTER_DECODER  (h263);

+ REGISTER_DECODER  (h263i);

+ REGISTER_DECODER  (h264);

+//REGISTER_DECODER    (huffyuv);

+//REGISTER_DECODER    (indeo2);

+//REGISTER_DECODER    (indeo3);

+//REGISTER_DECODER    (jpegls);

+//REGISTER_ENCODER    (ljpeg);

+//REGISTER_DECODER    (loco);

+//REGISTER_DECODER    (mjpeg);

+//REGISTER_DECODER    (mjpegb);

+//REGISTER_DECODER    (mpeg1video);

+//REGISTER_DECODER    (mpeg2video);

+ REGISTER_DECODER  (mpeg4);

+ REGISTER_DECODER  (mpegvideo);

+ REGISTER_DECODER  (msmpeg4v1);

+ REGISTER_DECODER  (msmpeg4v2);

+ REGISTER_DECODER  (msmpeg4v3);

+//REGISTER_DECODER    (msrle);

+//REGISTER_DECODER    (msvideo1);

+//REGISTER_DECODER    (mszh);

+//#ifdef CONFIG_ZLIB

+//EGISTER_ENCDEC        (png);

+//#endif

+//REGISTER_DECODER    (qpeg);

+//REGISTER_DECODER    (qtrle);

+//REGISTER_DECODER    (rpza);

+//REGISTER_DECODER    (rv10);

+//REGISTER_DECODER    (rv20);

+//#if __STDC_VERSION__ >= 199901L

+//REGISTER_ENCDEC        (snow);

+//#endif

+ REGISTER_DECODER  (svq1);

+ REGISTER_DECODER  (svq3);

+ REGISTER_DECODER  (theora);

+//REGISTER_DECODER    (truemotion1);

+//REGISTER_DECODER    (truemotion2);

+//REGISTER_DECODER    (tscc);

+//REGISTER_DECODER    (ulti);

+ REGISTER_DECODER  (vc1);

+//REGISTER_DECODER    (vcr1);

+//REGISTER_DECODER    (vp3);

+ REGISTER_DECODER  (vp5);

+ REGISTER_DECODER  (vp6);

+ REGISTER_DECODER  (vp6a);

+ REGISTER_DECODER  (vp6f);

+ REGISTER_DECODER  (wmv1);

+ REGISTER_DECODER  (wmv2);

+ REGISTER_DECODER  (wmv3);

+//REGISTER_DECODER    (wnv1);

+//REGISTER_DECODER    (xl);

+//REGISTER_DECODER    (zlib);

+//REGISTER_DECODER    (zmbv);

 

-        /* audio codecs */

-//    REGISTER_ENCODER    (ac3);

-//    REGISTER_DECODER    (atrac3);

-//    REGISTER_DECODER    (amr_nb);

-//    REGISTER_DECODER    (cook);

-//    REGISTER_DECODER    (flac);

-//    #ifdef __GNUC__

-//    REGISTER_DECODER    (imc);

-//    #endif

-//    REGISTER_DECODER    (mace3);

-//    REGISTER_DECODER    (mace6);

-//    REGISTER_DECODER    (msgsm);

-//    REGISTER_DECODER    (qdm2);

-//    #ifdef __GNUC__

-//    REGISTER_DECODER    (ra_144);

-//    REGISTER_DECODER    (ra_288);

-//    #endif

-//    REGISTER_DECODER    (truespeech);

-//    REGISTER_DECODER    (tta);

+/* audio codecs */

+//REGISTER_ENCODER    (ac3);

+//REGISTER_DECODER    (atrac3);

+//REGISTER_DECODER    (amr_nb);

+//REGISTER_DECODER    (cook);

+//REGISTER_DECODER    (flac);

+//#ifdef __GNUC__

+//REGISTER_DECODER    (imc);

+//#endif

+//REGISTER_DECODER    (mace3);

+//REGISTER_DECODER    (mace6);

+//REGISTER_DECODER    (msgsm);

+//REGISTER_DECODER    (qdm2);

+//#ifdef __GNUC__

+//REGISTER_DECODER    (ra_144);

+//REGISTER_DECODER    (ra_288);

+//#endif

+//REGISTER_DECODER    (truespeech);

+//REGISTER_DECODER    (tta);

 

-        /* pcm codecs */

-//    REGISTER_DECODER  (pcm_alaw);

-//    REGISTER_DECODER  (pcm_mulaw);

+/* pcm codecs */

+//REGISTER_DECODER  (pcm_alaw);

+//REGISTER_DECODER  (pcm_mulaw);

 

-    /* adpcm codecs */

-//    REGISTER_DECODER  (adpcm_4xm);

-//    REGISTER_DECODER  (adpcm_ct);

-//    REGISTER_DECODER  (adpcm_ea);

-//    REGISTER_DECODER  (adpcm_g726);

-//    REGISTER_DECODER  (adpcm_ima_amv);

-//    REGISTER_DECODER  (adpcm_ima_dk3);

-//    REGISTER_DECODER  (adpcm_ima_dk4);

-//    REGISTER_DECODER  (adpcm_ima_qt);

-//    REGISTER_DECODER  (adpcm_ima_smjpeg);

-//    REGISTER_DECODER  (adpcm_ima_wav);

-//    REGISTER_DECODER  (adpcm_ima_ws);

-//    REGISTER_DECODER  (adpcm_ms);

-//    REGISTER_DECODER  (adpcm_sbpro_2);

-//    REGISTER_DECODER  (adpcm_sbpro_3);

-//    REGISTER_DECODER  (adpcm_sbpro_4);

-//    REGISTER_DECODER  (adpcm_swf);

-//    REGISTER_DECODER  (adpcm_xa);

-//    REGISTER_DECODER  (adpcm_yamaha);

+/* adpcm codecs */

+//REGISTER_DECODER  (adpcm_4xm);

+//REGISTER_DECODER  (adpcm_ct);

+//REGISTER_DECODER  (adpcm_ea);

+//REGISTER_DECODER  (adpcm_g726);

+//REGISTER_DECODER  (adpcm_ima_amv);

+//REGISTER_DECODER  (adpcm_ima_dk3);

+//REGISTER_DECODER  (adpcm_ima_dk4);

+//REGISTER_DECODER  (adpcm_ima_qt);

+//REGISTER_DECODER  (adpcm_ima_smjpeg);

+//REGISTER_DECODER  (adpcm_ima_wav);

+//REGISTER_DECODER  (adpcm_ima_ws);

+//REGISTER_DECODER  (adpcm_ms);

+//REGISTER_DECODER  (adpcm_sbpro_2);

+//REGISTER_DECODER  (adpcm_sbpro_3);

+//REGISTER_DECODER  (adpcm_sbpro_4);

+//REGISTER_DECODER  (adpcm_swf);

+//REGISTER_DECODER  (adpcm_xa);

+//REGISTER_DECODER  (adpcm_yamaha);

 

-    /* parsers */

-    //REGISTER_PARSER  (AAC, aac);

-    //REGISTER_PARSER  (AC3, ac3);

-    //REGISTER_PARSER  (CAVSVIDEO, cavsvideo);

-    //REGISTER_PARSER  (DCA, dca);

-    //REGISTER_PARSER  (DVBSUB, dvbsub);

-    //REGISTER_PARSER  (DVDSUB, dvdsub);

-    //REGISTER_PARSER  (H261, h261);

-    //REGISTER_PARSER  (H263, h263);

-    //REGISTER_PARSER  (H264, h264);

-    //REGISTER_PARSER  (MJPEG, mjpeg);

-    //REGISTER_PARSER  (MLP, mlp);

-    //REGISTER_PARSER  (MPEG4VIDEO, mpeg4video);

-    //REGISTER_PARSER  (MPEGAUDIO, mpegaudio);

-    //REGISTER_PARSER  (MPEGVIDEO, mpegvideo);

-    //REGISTER_PARSER  (PNM, pnm);

-    //REGISTER_PARSER  (VC1, vc1);

+/* parsers */

+//REGISTER_PARSER  (AAC, aac);

+//REGISTER_PARSER  (AC3, ac3);

+//REGISTER_PARSER  (CAVSVIDEO, cavsvideo);

+//REGISTER_PARSER  (DCA, dca);

+//REGISTER_PARSER  (DVBSUB, dvbsub);

+//REGISTER_PARSER  (DVDSUB, dvdsub);

+//REGISTER_PARSER  (H261, h261);

+//REGISTER_PARSER  (H263, h263);

+//REGISTER_PARSER  (H264, h264);

+//REGISTER_PARSER  (MJPEG, mjpeg);

+//REGISTER_PARSER  (MLP, mlp);

+//REGISTER_PARSER  (MPEG4VIDEO, mpeg4video);

+//REGISTER_PARSER  (MPEGAUDIO, mpegaudio);

+//REGISTER_PARSER  (MPEGVIDEO, mpegvideo);

+//REGISTER_PARSER  (PNM, pnm);

+//REGISTER_PARSER  (VC1, vc1);

 }

diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec_vs2005.vcproj b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec_vs2005.vcproj
index 47fae898a..b8723dc5b 100644
--- a/src/filters/transform/mpcvideodec/ffmpeg/libavcodec_vs2005.vcproj
+++ b/src/filters/transform/mpcvideodec/ffmpeg/libavcodec_vs2005.vcproj
@@ -1604,6 +1604,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\libavutil\intfloat_readwrite.c"

+				>

+			</File>

+			<File

 				RelativePath=".\libavutil\intfloat_readwrite.h"

 				>

 			</File>

@@ -1660,6 +1664,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\libavutil\string.c"

+				>

+			</File>

+			<File

 				RelativePath=".\libavutil\x86_cpu.h"

 				>

 			</File>

diff --git a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj
index 404e05487..cf4ce0206 100644
--- a/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj
+++ b/src/filters/transform/mpeg2decfilter/Mpeg2DecFilter.vcproj
@@ -365,7 +365,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG"

+				PreprocessorDefinitions="WIN64;_DEBUG"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -379,7 +379,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalDependencies="basevideofilterDU.lib idct_mmx.obj motion_comp_mmx.obj"

+				AdditionalDependencies="basevideofilterDU.lib"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)DU.lib"

 				AdditionalLibraryDirectories="..\..\..\..\lib64"

 			/>

@@ -486,7 +486,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG"

+				PreprocessorDefinitions="WIN64;NDEBUG"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -499,7 +499,7 @@
 			/>

 			<Tool

 				Name="VCLibrarianTool"

-				AdditionalDependencies="basevideofilterRU.lib idct_mmx.obj motion_comp_mmx.obj"

+				AdditionalDependencies="basevideofilterRU.lib"

 				OutputFile="..\..\..\..\lib64\$(ProjectName)RU.lib"

 				AdditionalLibraryDirectories="..\..\..\..\lib64"

 			/>

@@ -546,6 +546,22 @@
 						AssemblerOutput="4"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Unicode lib|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Unicode lib|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\libmpeg2.cpp"

@@ -586,6 +602,22 @@
 						AssemblerOutput="4"

 					/>

 				</FileConfiguration>

+				<FileConfiguration

+					Name="Debug Unicode lib|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release Unicode lib|x64"

+					ExcludedFromBuild="true"

+					>

+					<Tool

+						Name="VCCLCompilerTool"

+					/>

+				</FileConfiguration>

 			</File>

 			<File

 				RelativePath=".\Mpeg2DecFilter.cpp"

diff --git a/src/libpng/libpng.vcproj b/src/libpng/libpng.vcproj
index 7485357f2..04ee10c89 100644
--- a/src/libpng/libpng.vcproj
+++ b/src/libpng/libpng.vcproj
@@ -106,7 +106,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\zlib"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				UsePrecompiledHeader="0"

 				DebugInformationFormat="3"

 			/>

@@ -227,7 +227,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\zlib"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 				UsePrecompiledHeader="0"

 			/>

 			<Tool

diff --git a/src/subpic/subpic.vcproj b/src/subpic/subpic.vcproj
index 003406e5e..f9285ca1f 100644
--- a/src/subpic/subpic.vcproj
+++ b/src/subpic/subpic.vcproj
@@ -102,7 +102,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -219,7 +219,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/subtitles/libssf/libssf.vcproj b/src/subtitles/libssf/libssf.vcproj
index a39342f47..61067534f 100644
--- a/src/subtitles/libssf/libssf.vcproj
+++ b/src/subtitles/libssf/libssf.vcproj
@@ -106,7 +106,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

@@ -227,7 +227,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 				UsePrecompiledHeader="2"

 			/>

 			<Tool

diff --git a/src/subtitles/subtitles.vcproj b/src/subtitles/subtitles.vcproj
index bf28412ea..3b6c604b6 100644
--- a/src/subtitles/subtitles.vcproj
+++ b/src/subtitles/subtitles.vcproj
@@ -103,7 +103,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;"

+				PreprocessorDefinitions="WIN64;_DEBUG;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -220,7 +220,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;"

+				PreprocessorDefinitions="WIN64;NDEBUG;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/CmdUI/CmdUI.vcproj b/src/ui/CmdUI/CmdUI.vcproj
index a166cfc7b..1d43b8287 100644
--- a/src/ui/CmdUI/CmdUI.vcproj
+++ b/src/ui/CmdUI/CmdUI.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/LCDUI/LCDUI.vcproj b/src/ui/LCDUI/LCDUI.vcproj
index cec19a50d..f3fa83995 100644
--- a/src/ui/LCDUI/LCDUI.vcproj
+++ b/src/ui/LCDUI/LCDUI.vcproj
@@ -101,7 +101,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\..\..\include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/ResizableLib/ResizableLib.vcproj b/src/ui/ResizableLib/ResizableLib.vcproj
index d7bfba0ac..9445a0534 100644
--- a/src/ui/ResizableLib/ResizableLib.vcproj
+++ b/src/ui/ResizableLib/ResizableLib.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/TreePropSheet/TreePropSheet.vcproj b/src/ui/TreePropSheet/TreePropSheet.vcproj
index b0268810a..5bf5bbb5f 100644
--- a/src/ui/TreePropSheet/TreePropSheet.vcproj
+++ b/src/ui/TreePropSheet/TreePropSheet.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB;"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/ui/sizecbar/sizecbar.vcproj b/src/ui/sizecbar/sizecbar.vcproj
index 6fe712319..873c7314e 100644
--- a/src/ui/sizecbar/sizecbar.vcproj
+++ b/src/ui/sizecbar/sizecbar.vcproj
@@ -101,7 +101,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"

+				PreprocessorDefinitions="WIN64;_DEBUG;_LIB;"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -216,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

+				PreprocessorDefinitions="WIN64;NDEBUG;_LIB"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

diff --git a/src/zlib/zlib.vcproj b/src/zlib/zlib.vcproj
index d11539a93..c55c3c446 100644
--- a/src/zlib/zlib.vcproj
+++ b/src/zlib/zlib.vcproj
@@ -105,7 +105,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"

+				PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS"

 				PrecompiledHeaderFile=".\Debug/zlib.pch"

 				DebugInformationFormat="3"

 			/>

@@ -225,7 +225,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS"

 				PrecompiledHeaderFile=".\Release/zlib.pch"

 			/>

 			<Tool