Index: build/win32/libx264.vcproj
===================================================================
--- build/win32/libx264.vcproj	(revision 736)
+++ build/win32/libx264.vcproj	(working copy)
@@ -1,170 +1,240 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="libx264"
 	ProjectGUID="{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}"
-	SccProjectName=""
-	SccLocalPath="">
+	RootNamespace="libx264"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="2"
-				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="./common,./encode,./decode,../../extras,../.."
 				PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__X264__;HAVE_MMX;ARCH_X86;HAVE_STDINT_H"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/libx264.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2052"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="bin/libx264.lib"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="true"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2052"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="./common,./encode,./decode,../../extras,../.."
 				PreprocessorDefinitions="_DEBUG;_LIB;WIN32;__X264__;HAVE_MMX;ARCH_X86;HAVE_STDINT_H"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/libx264.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2052"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="bin/libx264.lib"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="true"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2052"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release64|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="2"
-				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="./common,./encode,./decode,../../extras,../.."
 				PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__X264__;HAVE_MMX;ARCH_X86;HAVE_STDINT_H"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/libx264.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2052"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLibrarianTool"
 				OutputFile="bin/libx264.lib"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="true"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2052"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -172,21 +242,26 @@
 	<Files>
 		<Filter
 			Name="Enc"
-			Filter=".c">
+			Filter=".c"
+			>
 			<File
-				RelativePath="..\..\encoder\analyse.c">
+				RelativePath="..\..\encoder\analyse.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -194,33 +269,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/enc_debug/"
-						ProgramDataBaseFileName="obj/enc_debug/"/>
+						ProgramDataBaseFileName="obj/enc_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\encoder\cabac.c">
+				RelativePath="..\..\encoder\cabac.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -228,33 +310,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/enc_debug/"
-						ProgramDataBaseFileName="obj/enc_debug/"/>
+						ProgramDataBaseFileName="obj/enc_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\encoder\cavlc.c">
+				RelativePath="..\..\encoder\cavlc.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -262,33 +351,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/enc_debug/"
-						ProgramDataBaseFileName="obj/enc_debug/"/>
+						ProgramDataBaseFileName="obj/enc_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\encoder\encoder.c">
+				RelativePath="..\..\encoder\encoder.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -296,33 +392,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/enc_debug/"
-						ProgramDataBaseFileName="obj/enc_debug/"/>
+						ProgramDataBaseFileName="obj/enc_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\encoder\eval.c">
+				RelativePath="..\..\encoder\eval.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -330,33 +433,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/enc_debug/"
-						ProgramDataBaseFileName="obj/enc_debug/"/>
+						ProgramDataBaseFileName="obj/enc_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\encoder\macroblock.c">
+				RelativePath="..\..\encoder\macroblock.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -364,33 +474,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/enc_debug/"
-						ProgramDataBaseFileName="obj/enc_debug/"/>
+						ProgramDataBaseFileName="obj/enc_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\encoder\me.c">
+				RelativePath="..\..\encoder\me.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -398,33 +515,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/enc_debug/"
-						ProgramDataBaseFileName="obj/enc_debug/"/>
+						ProgramDataBaseFileName="obj/enc_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\encoder\ratecontrol.c">
+				RelativePath="..\..\encoder\ratecontrol.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -432,33 +556,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/enc_debug/"
-						ProgramDataBaseFileName="obj/enc_debug/"/>
+						ProgramDataBaseFileName="obj/enc_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\encoder\set.c">
+				RelativePath="..\..\encoder\set.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -466,56 +597,70 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/enc_debug/"
-						ProgramDataBaseFileName="obj/enc_debug/"/>
+						ProgramDataBaseFileName="obj/enc_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/enc_release/"
-						ProgramDataBaseFileName="obj/enc_release/"/>
+						ProgramDataBaseFileName="obj/enc_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<Filter
 				Name="enc_h"
-				Filter=".h">
+				Filter=".h"
+				>
 				<File
-					RelativePath="..\..\encoder\analyse.h">
+					RelativePath="..\..\encoder\analyse.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\encoder\macroblock.h">
+					RelativePath="..\..\encoder\macroblock.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\encoder\me.h">
+					RelativePath="..\..\encoder\me.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\encoder\ratecontrol.h">
+					RelativePath="..\..\encoder\ratecontrol.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\encoder\set.h">
+					RelativePath="..\..\encoder\set.h"
+					>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Core"
-			Filter=".c;.h;">
+			Filter=".c;.h;"
+			>
 			<File
-				RelativePath="..\..\common\cabac.c">
+				RelativePath="..\..\common\cabac.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -523,33 +668,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\common.c">
+				RelativePath="..\..\common\common.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -557,33 +709,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\cpu.c">
+				RelativePath="..\..\common\cpu.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -591,61 +750,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\csp.c">
+				RelativePath="..\..\common\dct.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release64|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\common\dct.c">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -653,33 +791,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\frame.c">
+				RelativePath="..\..\common\frame.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -687,33 +832,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\macroblock.c">
+				RelativePath="..\..\common\macroblock.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -721,33 +873,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\i386\mc-c.c">
+				RelativePath="..\..\common\i386\mc-c.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -755,33 +914,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\mc.c">
+				RelativePath="..\..\common\mc.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -789,33 +955,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\mdate.c">
+				RelativePath="..\..\common\mdate.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -823,33 +996,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\pixel.c">
+				RelativePath="..\..\common\pixel.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -857,33 +1037,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\predict.c">
+				RelativePath="..\..\common\i386\predict-c.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -891,33 +1078,40 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\i386\predict-c.c">
+				RelativePath="..\..\common\predict.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -925,574 +1119,684 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/core_debug/"
-						ProgramDataBaseFileName="obj/core_debug/"/>
+						ProgramDataBaseFileName="obj/core_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/core_release/"
-						ProgramDataBaseFileName="obj/core_release/"/>
+						ProgramDataBaseFileName="obj/core_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\common\quant.c">
+				RelativePath="..\..\common\quant.c"
+				>
 			</File>
 			<File
-				RelativePath="..\..\common\set.c">
+				RelativePath="..\..\common\set.c"
+				>
 			</File>
 			<Filter
 				Name="core_h"
-				Filter=".h">
+				Filter=".h"
+				>
 				<File
-					RelativePath="..\..\common\bs.h">
+					RelativePath="..\..\common\bs.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\cabac.h">
+					RelativePath="..\..\common\cabac.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\clip1.h">
+					RelativePath="..\..\common\clip1.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\common.h">
+					RelativePath="..\..\common\common.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\cpu.h">
+					RelativePath="..\..\common\cpu.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\csp.h">
+					RelativePath="..\..\common\dct.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\dct.h">
+					RelativePath="..\..\common\frame.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\frame.h">
+					RelativePath="..\..\common\macroblock.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\macroblock.h">
+					RelativePath="..\..\common\mc.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\mc.h">
+					RelativePath="..\..\common\pixel.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\pixel.h">
+					RelativePath="..\..\common\predict.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\predict.h">
+					RelativePath="..\..\common\set.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\set.h">
+					RelativePath="..\..\common\vlc.h"
+					>
 				</File>
-				<File
-					RelativePath="..\..\common\vlc.h">
-				</File>
 			</Filter>
 			<Filter
 				Name="I386"
-				Filter="*.h,*.c,*-a.asm">
+				Filter="*.h,*.c,*-a.asm"
+				>
 				<File
-					RelativePath="..\..\common\i386\cpu-a.asm">
+					RelativePath="..\..\common\i386\cpu-a.asm"
+					>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release64|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\dct-a.asm">
+					RelativePath="..\..\common\i386\dct-a.asm"
+					>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release64|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\dct.h">
+					RelativePath="..\..\common\i386\dct.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\deblock-a.asm">
+					RelativePath="..\..\common\i386\deblock-a.asm"
+					>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release64|Win32">
+						Name="Release64|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\i386inc.asm">
+					RelativePath="..\..\common\i386\i386inc.asm"
+					>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release64|Win32">
+						Name="Release64|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\mc-a.asm">
+					RelativePath="..\..\common\i386\mc-a.asm"
+					>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release64|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\mc-a2.asm">
+					RelativePath="..\..\common\i386\mc-a2.asm"
+					>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release64|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\pixel-a.asm">
+					RelativePath="..\..\common\i386\pixel-a.asm"
+					>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release64|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\pixel-sse2.asm">
+					RelativePath="..\..\common\i386\pixel-sse2.asm"
+					>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release64|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\pixel.h">
+					RelativePath="..\..\common\i386\pixel.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\predict-a.asm">
+					RelativePath="..\..\common\i386\predict-a.asm"
+					>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release64|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\i386\quant-a.asm">
+					RelativePath="..\..\common\i386\quant-a.asm"
+					>
 					<FileConfiguration
-						Name="Release|Win32">
+						Name="Release|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|Win32">
+						Name="Debug|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Release64|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
 							Description="Assembly $(InputPath)"
-							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="$(IntDir)\$(InputName).obj"/>
+							CommandLine="nasm -I..\..\common\i386\ -f win32 -DPREFIX -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="$(IntDir)\$(InputName).obj"
+						/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
 				Name="AMD64"
-				Filter="">
+				>
 				<File
-					RelativePath="..\..\common\amd64\amd64inc.asm">
+					RelativePath="..\..\common\amd64\amd64inc.asm"
+					>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\cpu-a.asm">
+					RelativePath="..\..\common\amd64\cpu-a.asm"
+					>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release64|Win32">
+						Name="Release64|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>
+							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\dct-a.asm">
+					RelativePath="..\..\common\amd64\dct-a.asm"
+					>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release64|Win32">
+						Name="Release64|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>
+							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\mc-a.asm">
+					RelativePath="..\..\common\amd64\mc-a.asm"
+					>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release64|Win32">
+						Name="Release64|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>
+							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\mc-a2.asm">
+					RelativePath="..\..\common\amd64\mc-a2.asm"
+					>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release64|Win32">
+						Name="Release64|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>
+							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\pixel-a.asm">
+					RelativePath="..\..\common\amd64\pixel-a.asm"
+					>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release64|Win32">
+						Name="Release64|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>
+							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\predict-a.asm">
+					RelativePath="..\..\common\amd64\predict-a.asm"
+					>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release64|Win32">
+						Name="Release64|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>
+							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"
+						/>
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\..\common\amd64\quant-a.asm">
+					RelativePath="..\..\common\amd64\quant-a.asm"
+					>
 					<FileConfiguration
 						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
+						ExcludedFromBuild="true"
+						>
 						<Tool
-							Name="VCCustomBuildTool"/>
+							Name="VCCustomBuildTool"
+						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release64|Win32">
+						Name="Release64|Win32"
+						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;
-"
-							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"/>
+							CommandLine="yasm -f win32 -m AMD64 -DWIN64 -o &quot;$(IntDir)\$(InputName)&quot;.obj &quot;$(InputPath)&quot;&#x0D;&#x0A;"
+							Outputs="&quot;$(IntDir)\$(InputName)&quot;.obj"
+						/>
 					</FileConfiguration>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Dec"
-			Filter=".c">
+			Filter=".c"
+			>
 			<File
-				RelativePath="..\..\decoder\decoder.c">
+				RelativePath="..\..\decoder\decoder.c"
+				>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/dec_release/"
-						ProgramDataBaseFileName="obj/dec_release/"/>
+						ProgramDataBaseFileName="obj/dec_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -1500,36 +1804,43 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/dec_debug/"
-						ProgramDataBaseFileName="obj/dec_debug/"/>
+						ProgramDataBaseFileName="obj/dec_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release64|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/dec_release/"
-						ProgramDataBaseFileName="obj/dec_release/"/>
+						ProgramDataBaseFileName="obj/dec_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\decoder\macroblock.c">
+				RelativePath="..\..\decoder\macroblock.c"
+				>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/dec_release/"
-						ProgramDataBaseFileName="obj/dec_release/"/>
+						ProgramDataBaseFileName="obj/dec_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -1537,36 +1848,43 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/dec_debug/"
-						ProgramDataBaseFileName="obj/dec_debug/"/>
+						ProgramDataBaseFileName="obj/dec_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release64|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/dec_release/"
-						ProgramDataBaseFileName="obj/dec_release/"/>
+						ProgramDataBaseFileName="obj/dec_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\decoder\set.c">
+				RelativePath="..\..\decoder\set.c"
+				>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/dec_release/"
-						ProgramDataBaseFileName="obj/dec_release/"/>
+						ProgramDataBaseFileName="obj/dec_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -1574,36 +1892,43 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/dec_debug/"
-						ProgramDataBaseFileName="obj/dec_debug/"/>
+						ProgramDataBaseFileName="obj/dec_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release64|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/dec_release/"
-						ProgramDataBaseFileName="obj/dec_release/"/>
+						ProgramDataBaseFileName="obj/dec_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\..\decoder\vlc.c">
+				RelativePath="..\..\decoder\vlc.c"
+				>
 				<FileConfiguration
 					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/dec_release/"
-						ProgramDataBaseFileName="obj/dec_release/"/>
+						ProgramDataBaseFileName="obj/dec_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -1611,51 +1936,63 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/dec_debug/"
-						ProgramDataBaseFileName="obj/dec_debug/"/>
+						ProgramDataBaseFileName="obj/dec_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release64|Win32"
-					ExcludedFromBuild="TRUE">
+					ExcludedFromBuild="true"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/dec_release/"
-						ProgramDataBaseFileName="obj/dec_release/"/>
+						ProgramDataBaseFileName="obj/dec_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<Filter
 				Name="dec_h"
-				Filter=".h">
+				Filter=".h"
+				>
 				<File
-					RelativePath="..\..\decoder\macroblock.h">
+					RelativePath="..\..\decoder\macroblock.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\decoder\set.h">
+					RelativePath="..\..\decoder\set.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\decoder\vlc.h">
+					RelativePath="..\..\decoder\vlc.h"
+					>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="extras"
-			Filter=".c">
+			Filter=".c"
+			>
 			<File
-				RelativePath="..\..\extras\getopt.c">
+				RelativePath="..\..\extras\getopt.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/util_release/"
-						ProgramDataBaseFileName="obj/util_release/"/>
+						ProgramDataBaseFileName="obj/util_release/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="0"
@@ -1663,27 +2000,33 @@
 						PreprocessorDefinitions=""
 						BasicRuntimeChecks="3"
 						ObjectFile=".\obj/util_debug/"
-						ProgramDataBaseFileName="obj/util_debug/"/>
+						ProgramDataBaseFileName="obj/util_debug/"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release64|Win32">
+					Name="Release64|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
 						ObjectFile=".\obj/util_release/"
-						ProgramDataBaseFileName="obj/util_release/"/>
+						ProgramDataBaseFileName="obj/util_release/"
+					/>
 				</FileConfiguration>
 			</File>
 			<Filter
 				Name="extras_h"
-				Filter=".h">
+				Filter=".h"
+				>
 				<File
-					RelativePath="..\..\extras\getopt.h">
+					RelativePath="..\..\extras\getopt.h"
+					>
 				</File>
 				<File
-					RelativePath="..\..\extras\stdint.h">
+					RelativePath="..\..\extras\stdint.h"
+					>
 				</File>
 			</Filter>
 		</Filter>
Index: build/win32/x264.sln
===================================================================
--- build/win32/x264.sln	(revision 736)
+++ build/win32/x264.sln	(working copy)
@@ -1,7 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libx264", "libx264.vcproj", "{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x264", "x264.vcproj", "{22E1814D-7955-4456-AEA5-0C9BA7500792}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -9,27 +8,26 @@
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-		Release64 = Release64
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+		Release64|Win32 = Release64|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Debug.ActiveCfg = Debug|Win32
-		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Debug.Build.0 = Debug|Win32
-		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release.ActiveCfg = Release|Win32
-		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release.Build.0 = Release|Win32
-		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release64.ActiveCfg = Release64|Win32
-		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release64.Build.0 = Release64|Win32
-		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Debug.ActiveCfg = Debug|Win32
-		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Debug.Build.0 = Debug|Win32
-		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release.ActiveCfg = Release|Win32
-		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release.Build.0 = Release|Win32
-		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release64.ActiveCfg = Release64|Win32
-		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release64.Build.0 = Release64|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Debug|Win32.Build.0 = Debug|Win32
+		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release|Win32.ActiveCfg = Release|Win32
+		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release|Win32.Build.0 = Release|Win32
+		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release64|Win32.ActiveCfg = Release64|Win32
+		{A8D6E4CD-1885-4B03-8E41-5F3DB825BAA6}.Release64|Win32.Build.0 = Release64|Win32
+		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Debug|Win32.ActiveCfg = Debug|Win32
+		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Debug|Win32.Build.0 = Debug|Win32
+		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release|Win32.ActiveCfg = Release|Win32
+		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release|Win32.Build.0 = Release|Win32
+		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release64|Win32.ActiveCfg = Release64|Win32
+		{22E1814D-7955-4456-AEA5-0C9BA7500792}.Release64|Win32.Build.0 = Release64|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
 EndGlobal
Index: build/win32/x264.vcproj
===================================================================
--- build/win32/x264.vcproj	(revision 736)
+++ build/win32/x264.vcproj	(working copy)
@@ -1,247 +1,354 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="x264"
 	ProjectGUID="{22E1814D-7955-4456-AEA5-0C9BA7500792}"
-	SccProjectName=""
-	SccLocalPath="">
+	RootNamespace="x264"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\obj/x264_Debug"
 			IntermediateDirectory=".\obj/x264_Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\obj/x264_Debug/x264.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../common;../../encode;../../decode;../../extras;../..;L:\gpac\include"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT"
+				AdditionalIncludeDirectories="../../common;../../encode;../../decode;../../extras;../..;C:\SRC\gpac\include"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT;MP4_OUTPUT"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\obj/x264_Debug/x264.pch"
 				AssemblerListingLocation=".\obj/x264_Debug/"
 				ObjectFile=".\obj/x264_Debug/"
 				ProgramDataBaseFileName=".\obj/x264_Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2052"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib"
+				AdditionalDependencies="vfw32.lib winmm.lib libgpac_static.lib"
 				OutputFile="bin/x264.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\extras"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\obj/x264_Debug/x264.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/x264_Debug/x264.tlb"
-				HeaderFileName=""/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2052"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\obj/x264_Release"
 			IntermediateDirectory=".\obj/x264_Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\obj/x264_Release/x264.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="./common;./encode;./decode;../../extras;../..;L:\gpac\include"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT"
-				StringPooling="TRUE"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				AdditionalIncludeDirectories="./common;./encode;./decode;../../extras;../..;C:\SRC\gpac\include"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT;MP4_OUTPUT"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\obj/x264_Release/x264.pch"
 				AssemblerListingLocation=".\obj/x264_Release/"
 				ObjectFile=".\obj/x264_Release/"
 				ProgramDataBaseFileName=".\obj/x264_Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2052"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib"
+				AdditionalDependencies="vfw32.lib winmm.lib libgpac_static.lib"
 				OutputFile="bin/x264.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="../../extras"
 				ProgramDatabaseFile=".\obj/x264_Release/x264.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/x264_Release/x264.tlb"
-				HeaderFileName=""/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2052"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release64|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\obj/x264_Release/x264.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="./common;./encode;./decode;../../extras;../..;..\..\..\gpac\include"
 				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__X264__;HAVE_MMX;HAVE_STDINT_H;AVIS_INPUT;MP4_OUTPUT"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\obj/x264_Release/x264.pch"
 				AssemblerListingLocation=".\obj/x264_Release/"
 				ObjectFile=".\obj/x264_Release/"
 				ProgramDataBaseFileName=".\obj/x264_Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2052"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="vfw32.lib ..\..\..\gpac\bin\w32_rel\libgpac_static.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib bufferoverflowu.lib $(NOINHERIT)"
 				OutputFile="bin/x264.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="FALSE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="false"
 				ProgramDatabaseFile=".\obj/x264_Release/x264.pdb"
 				SubSystem="1"
-				TargetMachine="0"/>
+				TargetMachine="0"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\obj/x264_Release/x264.tlb"
-				HeaderFileName=""/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2052"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\matroska.c">
+			RelativePath="..\..\matroska.c"
+			>
 		</File>
 		<File
-			RelativePath="..\..\matroska.h">
+			RelativePath="..\..\matroska.h"
+			>
 		</File>
 		<File
-			RelativePath="..\..\muxers.c">
+			RelativePath="..\..\muxers.c"
+			>
 		</File>
 		<File
-			RelativePath="..\..\muxers.h">
+			RelativePath="..\..\muxers.h"
+			>
 		</File>
 		<File
-			RelativePath="..\..\x264.c">
+			RelativePath="..\..\x264.c"
+			>
 			<FileConfiguration
-				Name="Debug|Win32">
+				Name="Debug|Win32"
+				>
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="0"
 					AdditionalIncludeDirectories=""
 					PreprocessorDefinitions=""
-					BasicRuntimeChecks="3"/>
+					BasicRuntimeChecks="3"
+				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32">
+				Name="Release|Win32"
+				>
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="2"
 					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
+					PreprocessorDefinitions=""
+				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release64|Win32">
+				Name="Release64|Win32"
+				>
 				<Tool
 					Name="VCCLCompilerTool"
 					Optimization="2"
 					AdditionalIncludeDirectories=""
-					PreprocessorDefinitions=""/>
+					PreprocessorDefinitions=""
+				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\..\x264.h">
+			RelativePath="..\..\x264.h"
+			>
 		</File>
 	</Files>
 	<Globals>
Index: common/i386/pixel-a.asm
===================================================================
--- common/i386/pixel-a.asm	(revision 736)
+++ common/i386/pixel-a.asm	(working copy)
@@ -1593,7 +1593,7 @@
     mov     ebp, [ecx+esi]
     mov     edx, [ecx+esi+4]
     or      edx, ebp
-    jz .nexti
+    jz near .nexti
     xor     edx, edx
 %macro TEST 1
     mov     [ebx+eax*2], si
Index: encoder/ratecontrol.c
===================================================================
--- encoder/ratecontrol.c	(revision 736)
+++ encoder/ratecontrol.c	(working copy)
@@ -29,6 +29,11 @@
 #include <limits.h>
 #include <assert.h>
 
+/* some kind of VC8-only guard here [smcgovern] */
+#define strtok_r( _s, _sep, _lasts ) \
+        ( *(_lasts) = strtok( (_s), (_sep) ) )
+/* end guard [smcgovern] */
+
 #include "common/common.h"
 #include "common/cpu.h"
 #include "ratecontrol.h"