--- trunk/xvidcore/build/win32/libxvidcore.vcproj	2010/10/10 19:24:24	1894
+++ trunk/xvidcore/build/win32/libxvidcore.vcproj	2010/11/16 14:42:07	1906
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="libxvidcore"
 	ProjectGUID="{64954A96-C813-4A92-87AD-DD733A5404AF}"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -82,6 +83,8 @@
 				ModuleDefinitionFile="..\generic\libxvidcore.def"
 				ProgramDatabaseFile=".\Release/xvidcore.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="bin\xvidcore.dll.a"
 				TargetMachine="1"
 			/>
@@ -106,9 +109,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -178,6 +178,8 @@
 				ModuleDefinitionFile="..\generic\libxvidcore.def"
 				ProgramDatabaseFile="$(IntDir)/xvidcore.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="bin\x64\xvidcore.dll.a"
 				TargetMachine="17"
 			/>
@@ -202,9 +204,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -274,6 +273,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/xvidcore.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="bin\xvidcore.dll.a"
 				TargetMachine="1"
 			/>
@@ -298,9 +299,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -370,6 +368,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\xvidcore.pdb"
 				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary="bin\x64\xvidcore.dll.a"
 				TargetMachine="17"
 			/>
@@ -394,9 +394,6 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -428,11 +425,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\README"
+				RelativePath="..\..\doc\README"
 				>
 			</File>
 			<File
-				RelativePath="..\..\doc\README"
+				RelativePath="..\..\README"
 				>
 			</File>
 			<File
@@ -3455,10 +3452,6 @@
 					/>
 				</FileConfiguration>
 			</File>
- 			<File
-				RelativePath="..\..\src\plugins\plugin_psnrhvsm.c"
-			>
-			</File>
 			<File
 				RelativePath="..\..\src\plugins\plugin_psnr.c"
 				>
@@ -3496,6 +3489,10 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath="..\..\src\plugins\plugin_psnrhvsm.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\plugins\plugin_single.c"
 				>
 				<FileConfiguration