legacy branch: merge r3209-r3382 from trunk (the translations aren't up to date with any implications this may have)legacy

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

2 files changed, 3 insertions, 812 deletions

diff --git a/src/filters/parser/DiracSplitter/libdirac/libdirac.vcproj b/src/filters/parser/DiracSplitter/libdirac/libdirac.vcproj
deleted file mode 100644
index 9c62464d5..000000000
--- a/src/filters/parser/DiracSplitter/libdirac/libdirac.vcproj
+++ /dev/null
@@ -1,790 +0,0 @@
-<?xml version="1.0" encoding="windows-1250"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="9,00"

-	Name="libdirac"

-	ProjectGUID="{12BE3440-A1F3-4C48-A229-30CB619EA276}"

-	RootNamespace="libdirac"

-	Keyword="Win32Proj"

-	TargetFrameworkVersion="131072"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-		<Platform

-			Name="x64"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			ConfigurationType="4"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\debug.vsprops"

-			UseOfMFC="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SCL_SECURE_NO_WARNINGS"

-				UsePrecompiledHeader="0"

-				WarningLevel="0"

-				DisableSpecificWarnings="4800;"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Debug|x64"

-			ConfigurationType="4"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\debug.vsprops"

-			UseOfMFC="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="_WIN64;_DEBUG;_LIB;_SCL_SECURE_NO_WARNINGS"

-				UsePrecompiledHeader="0"

-				WarningLevel="0"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			ConfigurationType="4"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\release.vsprops"

-			UseOfMFC="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="."

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

-				UsePrecompiledHeader="0"

-				WarningLevel="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|x64"

-			ConfigurationType="4"

-			InheritedPropertySheets="..\..\..\..\common.vsprops;..\..\..\..\release.vsprops"

-			UseOfMFC="1"

-			CharacterSet="2"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-				TargetEnvironment="3"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="."

-				PreprocessorDefinitions="_WIN64;NDEBUG;_LIB;HAVE_MMX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS"

-				EnableEnhancedInstructionSet="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="0"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-			<File

-				RelativePath=".\libdirac_byteio\accessunit_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\arith_codec.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\band_codec.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\band_vlc.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\bit_manager.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\block_match.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\cmd_line.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\codingparams_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\common.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\comp_compress.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\comp_decompress.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\component_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\dirac_assertions.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\dirac_byte_stats.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\dirac_byte_stream.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\dirac_cppparser.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\dirac_encoder.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\dirac_exception.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\dirac_parser.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\displayparams_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\downconvert.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\downconvert_mmx.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\enc_picture.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\enc_queue.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\endofsequence_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\me_mode_decn.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\me_subpel.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\me_utils.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\me_utils_mmx.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\mot_comp.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\mot_comp_mmx.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\motion.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\motion_estimate.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\mv_codec.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\mvdata_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\mvdataelement_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\parseparams_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\parseunit_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\pic_io.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\picture.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\picture_buffer.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\picture_compress.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\picture_decompress.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\pixel_match.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\prefilter.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\quality_monitor.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\quant_chooser.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\rate_control.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\seq_compress.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\seq_decompress.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\subband_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\transform_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\upconvert.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\upconvert_mmx.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\video_format_defaults.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\wavelet_utils.cpp"

-				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						GeneratePreprocessedFile="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						GeneratePreprocessedFile="0"

-					/>

-				</FileConfiguration>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\wavelet_utils_mmx.cpp"

-				>

-				<FileConfiguration

-					Name="Release|Win32"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						GeneratePreprocessedFile="0"

-					/>

-				</FileConfiguration>

-				<FileConfiguration

-					Name="Release|x64"

-					>

-					<Tool

-						Name="VCCLCompilerTool"

-						GeneratePreprocessedFile="0"

-					/>

-				</FileConfiguration>

-			</File>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-			<File

-				RelativePath=".\libdirac_byteio\accessunit_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\arith_codec.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\arrays.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\band_codec.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\band_codec_template.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\band_vlc.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\bit_manager.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\block_match.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\cmd_line.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\codingparams_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\common.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\common_types.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\comp_compress.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\comp_decompress.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\component_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\decoder_types.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\dirac_assertions.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\dirac_byte_stats.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\dirac_byte_stream.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\dirac_cppparser.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\dirac_encoder.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\dirac_exception.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\dirac_inttypes.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\dirac_parser.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\dirac_types.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\displayparams_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\downconvert.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\enc_picture.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\enc_queue.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\endofsequence_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\me_mode_decn.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\me_subpel.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\me_utils.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\me_utils_mmx.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\mot_comp.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\mot_comp_mmx.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\motion.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\motion_estimate.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\mv_codec.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\mvdata_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\mvdataelement_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\parseparams_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\parseunit_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\pic_io.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\picture.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\picture_buffer.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\picture_byteio.cpp"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\picture_compress.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\picture_decompress.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_motionest\pixel_match.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\prefilter.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\quality_monitor.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\quant_chooser.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\rate_control.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_encoder\seq_compress.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_decoder\seq_decompress.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\subband_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_byteio\transform_byteio.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\upconvert.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\video_format_defaults.h"

-				>

-			</File>

-			<File

-				RelativePath=".\libdirac_common\wavelet_utils.h"

-				>

-			</File>

-		</Filter>

-	</Files>

-	<Globals>

-		<Global

-			Name="DevPartner_IsInstrumented"

-			Value="0"

-		/>

-	</Globals>

-</VisualStudioProject>

diff --git a/src/filters/parser/DiracSplitter/libdirac/libdirac.vcxproj b/src/filters/parser/DiracSplitter/libdirac/libdirac.vcxproj
index 499fdb23a..9eb5e6ed3 100644
--- a/src/filters/parser/DiracSplitter/libdirac/libdirac.vcxproj
+++ b/src/filters/parser/DiracSplitter/libdirac/libdirac.vcxproj
@@ -72,7 +72,6 @@
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>TurnOffAllWarnings</WarningLevel>

-      <DisableSpecificWarnings>4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Lib>

       <TargetMachine>MachineX86</TargetMachine>

@@ -87,7 +86,6 @@
       <PreprocessorDefinitions>_WIN64;_DEBUG;_LIB;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>TurnOffAllWarnings</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <DisableSpecificWarnings>4267</DisableSpecificWarnings>

     </ClCompile>

     <Lib>

       <TargetMachine>MachineX64</TargetMachine>

@@ -98,7 +96,6 @@
       <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_MMX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <WarningLevel>TurnOffAllWarnings</WarningLevel>

-      <DisableSpecificWarnings>4244;4800;4355;%(DisableSpecificWarnings)</DisableSpecificWarnings>

     </ClCompile>

     <Lib>

       <TargetMachine>MachineX86</TargetMachine>

@@ -113,8 +110,7 @@
       <PreprocessorDefinitions>_WIN64;NDEBUG;_LIB;HAVE_MMX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>

       <WarningLevel>TurnOffAllWarnings</WarningLevel>

-      <DisableSpecificWarnings>4267</DisableSpecificWarnings>

-    </ClCompile>

+     </ClCompile>

     <Lib>

       <TargetMachine>MachineX64</TargetMachine>

     </Lib>

@@ -176,18 +172,8 @@
     <ClCompile Include="libdirac_common\upconvert.cpp" />

     <ClCompile Include="libdirac_common\upconvert_mmx.cpp" />

     <ClCompile Include="libdirac_common\video_format_defaults.cpp" />

-    <ClCompile Include="libdirac_common\wavelet_utils.cpp">

-      <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PreprocessToFile>

-      <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PreprocessSuppressLineNumbers>

-      <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PreprocessToFile>

-      <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PreprocessSuppressLineNumbers>

-    </ClCompile>

-    <ClCompile Include="libdirac_common\wavelet_utils_mmx.cpp">

-      <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PreprocessToFile>

-      <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PreprocessSuppressLineNumbers>

-      <PreprocessToFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PreprocessToFile>

-      <PreprocessSuppressLineNumbers Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PreprocessSuppressLineNumbers>

-    </ClCompile>

+    <ClCompile Include="libdirac_common\wavelet_utils.cpp" />

+    <ClCompile Include="libdirac_common\wavelet_utils_mmx.cpp" />

     <ClCompile Include="libdirac_byteio\picture_byteio.cpp" />

   </ItemGroup>

   <ItemGroup>

@@ -256,9 +242,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-  <ProjectExtensions>

-    <VisualStudio>

-      <UserProperties DevPartner_IsInstrumented="0" />

-    </VisualStudio>

-  </ProjectExtensions>

 </Project>
\ No newline at end of file