Merge "webmdshow cleanup: clang-format vp9decoder/dllentry.cpp"
diff --git a/common/cenumpins.hpp b/common/cenumpins.hpp
index fdce756..873d584 100644
--- a/common/cenumpins.hpp
+++ b/common/cenumpins.hpp
@@ -7,9 +7,12 @@
// be found in the AUTHORS file in the root of the source tree.
#pragma once
-#include "tenumxxx.hpp"
+#include <strmif.h>
+
#include <vector>
+#include "tenumxxx.hpp"
+
class CEnumPins : public TEnumXXX<IEnumPins, IPin*>
{
virtual ~CEnumPins();
diff --git a/mediafoundation/webmmf_2010.sln b/mediafoundation/webmmf.sln
similarity index 96%
rename from mediafoundation/webmmf_2010.sln
rename to mediafoundation/webmmf.sln
index 0608b1a..4c46818 100644
--- a/mediafoundation/webmmf_2010.sln
+++ b/mediafoundation/webmmf.sln
@@ -1,11 +1,11 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webmmfsource_2010", "webmmfsource\webmmfsource_2010.vcxproj", "{9A43AE3B-13E0-4871-B08C-C20E5D72A323}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webmmfsource", "webmmfsource\webmmfsource.vcxproj", "{9A43AE3B-13E0-4871-B08C-C20E5D72A323}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webmmfvp8dec_2010", "webmmfvp8dec\webmmfvp8dec_2010.vcxproj", "{288D8052-555F-4AED-8FB2-CA2EB34D5CBE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webmmfvp8dec", "webmmfvp8dec\webmmfvp8dec.vcxproj", "{288D8052-555F-4AED-8FB2-CA2EB34D5CBE}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webmmfvorbisdec_2010", "webmmfvorbisdec\webmmfvorbisdec_2010.vcxproj", "{560D4BFA-63B9-468E-8845-7705DE2FBDDF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webmmfvorbisdec", "webmmfvorbisdec\webmmfvorbisdec.vcxproj", "{560D4BFA-63B9-468E-8845-7705DE2FBDDF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/mediafoundation/webmmf_2008.sln b/mediafoundation/webmmf_2008.sln
deleted file mode 100644
index b5a6538..0000000
--- a/mediafoundation/webmmf_2008.sln
+++ /dev/null
@@ -1,121 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webmmfsource_2008", "webmmfsource\webmmfsource_2008.vcproj", "{9A43AE3B-13E0-4871-B08C-C20E5D72A323}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webmmfvp8dec_2008", "webmmfvp8dec\webmmfvp8dec_2008.vcproj", "{288D8052-555F-4AED-8FB2-CA2EB34D5CBE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webmmfvorbisdec_2008", "webmmfvorbisdec\webmmfvorbisdec_2008.vcproj", "{560D4BFA-63B9-468E-8845-7705DE2FBDDF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webmmftests", "webmmftests", "{E53C42C4-B1E3-4DDA-BFBD-0B9A325544EF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mfplay", "webmmftests\mfplay\mfplay.vcproj", "{96EA6AEE-53FB-4402-AB02-155C6A501447}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WMPPlay", "webmmftests\WMPPlay\WMPPlay.csproj", "{73D52465-E6B3-43D8-BC45-CCEA2060DA3E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdlplay", "webmmftests\sdlplay\sdlplay.vcproj", "{BC765DC7-5514-4399-8906-9B24C07C5D47}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|Mixed Platforms = Debug|Mixed Platforms
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Any CPU = Release|Any CPU
- Release|Mixed Platforms = Release|Mixed Platforms
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Debug|Any CPU.ActiveCfg = Debug|x64
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Debug|Mixed Platforms.Build.0 = Debug|x64
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Debug|Win32.ActiveCfg = Debug|Win32
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Debug|Win32.Build.0 = Debug|Win32
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Debug|x64.ActiveCfg = Debug|x64
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Debug|x64.Build.0 = Debug|x64
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Release|Any CPU.ActiveCfg = Release|x64
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Release|Mixed Platforms.ActiveCfg = Release|x64
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Release|Mixed Platforms.Build.0 = Release|x64
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Release|Win32.ActiveCfg = Release|Win32
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Release|Win32.Build.0 = Release|Win32
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Release|x64.ActiveCfg = Release|x64
- {9A43AE3B-13E0-4871-B08C-C20E5D72A323}.Release|x64.Build.0 = Release|x64
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Debug|Any CPU.ActiveCfg = Debug|x64
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Debug|Mixed Platforms.Build.0 = Debug|x64
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Debug|Win32.ActiveCfg = Debug|Win32
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Debug|Win32.Build.0 = Debug|Win32
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Debug|x64.ActiveCfg = Debug|x64
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Debug|x64.Build.0 = Debug|x64
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Release|Any CPU.ActiveCfg = Release|x64
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Release|Mixed Platforms.ActiveCfg = Release|x64
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Release|Mixed Platforms.Build.0 = Release|x64
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Release|Win32.ActiveCfg = Release|Win32
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Release|Win32.Build.0 = Release|Win32
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Release|x64.ActiveCfg = Release|x64
- {288D8052-555F-4AED-8FB2-CA2EB34D5CBE}.Release|x64.Build.0 = Release|x64
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Debug|Any CPU.ActiveCfg = Debug|x64
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Debug|Mixed Platforms.Build.0 = Debug|x64
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Debug|Win32.ActiveCfg = Debug|Win32
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Debug|Win32.Build.0 = Debug|Win32
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Debug|x64.ActiveCfg = Debug|x64
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Debug|x64.Build.0 = Debug|x64
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Release|Any CPU.ActiveCfg = Release|x64
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Release|Mixed Platforms.ActiveCfg = Release|x64
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Release|Mixed Platforms.Build.0 = Release|x64
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Release|Win32.ActiveCfg = Release|Win32
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Release|Win32.Build.0 = Release|Win32
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Release|x64.ActiveCfg = Release|x64
- {560D4BFA-63B9-468E-8845-7705DE2FBDDF}.Release|x64.Build.0 = Release|x64
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Debug|Any CPU.ActiveCfg = Debug|x64
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Debug|Mixed Platforms.Build.0 = Debug|x64
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Debug|Win32.ActiveCfg = Debug|Win32
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Debug|Win32.Build.0 = Debug|Win32
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Debug|x64.ActiveCfg = Debug|x64
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Debug|x64.Build.0 = Debug|x64
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Release|Any CPU.ActiveCfg = Release|x64
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Release|Mixed Platforms.ActiveCfg = Release|x64
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Release|Mixed Platforms.Build.0 = Release|x64
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Release|Win32.ActiveCfg = Release|Win32
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Release|Win32.Build.0 = Release|Win32
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Release|x64.ActiveCfg = Release|x64
- {96EA6AEE-53FB-4402-AB02-155C6A501447}.Release|x64.Build.0 = Release|x64
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Debug|x64.ActiveCfg = Debug|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Release|Any CPU.Build.0 = Release|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Release|Win32.ActiveCfg = Release|Any CPU
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E}.Release|x64.ActiveCfg = Release|Any CPU
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Debug|Any CPU.ActiveCfg = Debug|x64
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Debug|Mixed Platforms.Build.0 = Debug|x64
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Debug|Win32.ActiveCfg = Debug|Win32
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Debug|Win32.Build.0 = Debug|Win32
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Debug|x64.ActiveCfg = Debug|x64
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Debug|x64.Build.0 = Debug|x64
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Release|Any CPU.ActiveCfg = Release|x64
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Release|Mixed Platforms.ActiveCfg = Release|x64
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Release|Mixed Platforms.Build.0 = Release|x64
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Release|Win32.ActiveCfg = Release|Win32
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Release|Win32.Build.0 = Release|Win32
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Release|x64.ActiveCfg = Release|x64
- {BC765DC7-5514-4399-8906-9B24C07C5D47}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {96EA6AEE-53FB-4402-AB02-155C6A501447} = {E53C42C4-B1E3-4DDA-BFBD-0B9A325544EF}
- {73D52465-E6B3-43D8-BC45-CCEA2060DA3E} = {E53C42C4-B1E3-4DDA-BFBD-0B9A325544EF}
- {BC765DC7-5514-4399-8906-9B24C07C5D47} = {E53C42C4-B1E3-4DDA-BFBD-0B9A325544EF}
- EndGlobalSection
-EndGlobal
diff --git a/mediafoundation/webmmfsource/webmmfsource_2010.vcxproj b/mediafoundation/webmmfsource/webmmfsource.vcxproj
similarity index 97%
rename from mediafoundation/webmmfsource/webmmfsource_2010.vcxproj
rename to mediafoundation/webmmfsource/webmmfsource.vcxproj
index 684e91d..27689d2 100644
--- a/mediafoundation/webmmfsource/webmmfsource_2010.vcxproj
+++ b/mediafoundation/webmmfsource/webmmfsource.vcxproj
@@ -1,205 +1,209 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{9A43AE3B-13E0-4871-B08C-C20E5D72A323}</ProjectGuid>
- <RootNamespace>webmmfsource</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\dll\webmmf\$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\dll\webmmf\$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\dll\webmmf\$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\dll\webmmf\$(Platform)\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">webmmfsource$(PlatformArchitecture)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">webmmfsource$(PlatformArchitecture)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">webmmfsource$(PlatformArchitecture)</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">webmmfsource$(PlatformArchitecture)</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>false</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>OldStyle</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>mf.lib;mfuuid.lib;mfplat.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
- <ModuleDefinitionFile>webmmfsource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>NotSet</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <BrowseInformation>true</BrowseInformation>
- <WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>OldStyle</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>mf.lib;mfuuid.lib;mfplat.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
- <ModuleDefinitionFile>webmmfsource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <FunctionLevelLinking>false</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level4</WarningLevel>
- <DebugInformationFormat>
- </DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>mf.lib;mfuuid.lib;mfplat.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
- <ModuleDefinitionFile>webmmfsource.def</ModuleDefinitionFile>
- <GenerateDebugInformation>false</GenerateDebugInformation>
- <SubSystem>NotSet</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <AdditionalIncludeDirectories>$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN64;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <WarningLevel>Level4</WarningLevel>
- </ClCompile>
- <Link>
- <AdditionalDependencies>mf.lib;mfuuid.lib;mfplat.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
- <ModuleDefinitionFile>webmmfsource.def</ModuleDefinitionFile>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="resource.h" />
- <ClInclude Include="..\..\common\cfactory.hpp" />
- <ClInclude Include="..\..\common\clockable.hpp" />
- <ClInclude Include="..\..\common\comreg.hpp" />
- <ClInclude Include="..\..\common\iidstr.hpp" />
- <ClInclude Include="..\..\common\omahautil.hpp" />
- <ClInclude Include="..\..\common\registry.hpp" />
- <ClInclude Include="..\..\common\versionhandling.hpp" />
- <ClInclude Include="..\..\common\vorbistypes.hpp" />
- <ClInclude Include="..\..\common\webmtypes.hpp" />
- <ClInclude Include="..\..\..\libwebm\mkvparser.hpp" />
- <ClInclude Include="mkvreader.hpp" />
- <ClInclude Include="webmmfbytestreamhandler.hpp" />
- <ClInclude Include="webmmfsource.hpp" />
- <ClInclude Include="webmmfstream.hpp" />
- <ClInclude Include="webmmfstreamaudio.hpp" />
- <ClInclude Include="webmmfstreamvideo.hpp" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="webmmfsource.rc" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\common\cfactory.cpp" />
- <ClCompile Include="..\..\common\clockable.cpp" />
- <ClCompile Include="..\..\common\comreg.cpp" />
- <ClCompile Include="..\..\common\iidstr.cpp" />
- <ClCompile Include="..\..\common\omahautil.cpp" />
- <ClCompile Include="..\..\common\versionhandling.cpp" />
- <ClCompile Include="..\..\common\vorbistypes.cpp" />
- <ClCompile Include="..\..\common\webmtypes.cpp" />
- <ClCompile Include="..\..\..\libwebm\mkvparser.cpp" />
- <ClCompile Include="mkvreader.cpp" />
- <ClCompile Include="dllentry.cpp" />
- <ClCompile Include="webmmfbytestreamhandler.cpp" />
- <ClCompile Include="webmmfsource.cpp" />
- <ClCompile Include="webmmfstream.cpp" />
- <ClCompile Include="webmmfstreamaudio.cpp" />
- <ClCompile Include="webmmfstreamvideo.cpp" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{9A43AE3B-13E0-4871-B08C-C20E5D72A323}</ProjectGuid>
+ <RootNamespace>webmmfsource</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\dll\webmmf\$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\dll\webmmf\$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\dll\webmmf\$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\dll\webmmf\$(Platform)\$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">webmmfsource$(PlatformArchitecture)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">webmmfsource$(PlatformArchitecture)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">webmmfsource$(PlatformArchitecture)</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">webmmfsource$(PlatformArchitecture)</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>false</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>mf.lib;mfuuid.lib;mfplat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
+ <ModuleDefinitionFile>webmmfsource.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>NotSet</SubSystem>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BrowseInformation>true</BrowseInformation>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>OldStyle</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>mf.lib;mfuuid.lib;mfplat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
+ <ModuleDefinitionFile>webmmfsource.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <FunctionLevelLinking>false</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <DebugInformationFormat>
+ </DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>mf.lib;mfuuid.lib;mfplat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
+ <ModuleDefinitionFile>webmmfsource.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>false</GenerateDebugInformation>
+ <SubSystem>NotSet</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN64;_WINDOWS;_USRDLL;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <WarningLevel>Level4</WarningLevel>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>mf.lib;mfuuid.lib;mfplat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
+ <ModuleDefinitionFile>webmmfsource.def</ModuleDefinitionFile>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="..\..\common\cfactory.hpp" />
+ <ClInclude Include="..\..\common\clockable.hpp" />
+ <ClInclude Include="..\..\common\comreg.hpp" />
+ <ClInclude Include="..\..\common\iidstr.hpp" />
+ <ClInclude Include="..\..\common\omahautil.hpp" />
+ <ClInclude Include="..\..\common\registry.hpp" />
+ <ClInclude Include="..\..\common\versionhandling.hpp" />
+ <ClInclude Include="..\..\common\vorbistypes.hpp" />
+ <ClInclude Include="..\..\common\webmtypes.hpp" />
+ <ClInclude Include="..\..\..\libwebm\mkvparser.hpp" />
+ <ClInclude Include="mkvreader.hpp" />
+ <ClInclude Include="webmmfbytestreamhandler.hpp" />
+ <ClInclude Include="webmmfsource.hpp" />
+ <ClInclude Include="webmmfstream.hpp" />
+ <ClInclude Include="webmmfstreamaudio.hpp" />
+ <ClInclude Include="webmmfstreamvideo.hpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="webmmfsource.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\common\cfactory.cpp" />
+ <ClCompile Include="..\..\common\clockable.cpp" />
+ <ClCompile Include="..\..\common\comreg.cpp" />
+ <ClCompile Include="..\..\common\iidstr.cpp" />
+ <ClCompile Include="..\..\common\omahautil.cpp" />
+ <ClCompile Include="..\..\common\versionhandling.cpp" />
+ <ClCompile Include="..\..\common\vorbistypes.cpp" />
+ <ClCompile Include="..\..\common\webmtypes.cpp" />
+ <ClCompile Include="..\..\..\libwebm\mkvparser.cpp" />
+ <ClCompile Include="mkvreader.cpp" />
+ <ClCompile Include="dllentry.cpp" />
+ <ClCompile Include="webmmfbytestreamhandler.cpp" />
+ <ClCompile Include="webmmfsource.cpp" />
+ <ClCompile Include="webmmfstream.cpp" />
+ <ClCompile Include="webmmfstreamaudio.cpp" />
+ <ClCompile Include="webmmfstreamvideo.cpp" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
</Project>
\ No newline at end of file
diff --git a/mediafoundation/webmmfsource/webmmfsource_2010.vcxproj.filters b/mediafoundation/webmmfsource/webmmfsource.vcxproj.filters
similarity index 100%
rename from mediafoundation/webmmfsource/webmmfsource_2010.vcxproj.filters
rename to mediafoundation/webmmfsource/webmmfsource.vcxproj.filters
diff --git a/mediafoundation/webmmfsource/webmmfsource_2008.vcproj b/mediafoundation/webmmfsource/webmmfsource_2008.vcproj
deleted file mode 100644
index bb0a327..0000000
--- a/mediafoundation/webmmfsource/webmmfsource_2008.vcproj
+++ /dev/null
@@ -1,476 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="webmmfsource_2008"
- ProjectGUID="{9A43AE3B-13E0-4871-B08C-C20E5D72A323}"
- RootNamespace="webmmfsource"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="4"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mf.lib mfuuid.lib mfplat.lib"
- OutputFile="$(OutDir)\webmmfsource32.dll"
- LinkIncremental="2"
- GenerateManifest="false"
- ModuleDefinitionFile="webmmfsource.def"
- GenerateDebugInformation="true"
- SubSystem="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm"
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- BrowseInformation="1"
- WarningLevel="4"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mf.lib mfuuid.lib mfplat.lib"
- OutputFile="$(OutDir)\webmmfsource64.dll"
- GenerateManifest="false"
- ModuleDefinitionFile="webmmfsource.def"
- GenerateDebugInformation="true"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NOMINMAX"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="false"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- DebugInformationFormat="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mf.lib mfuuid.lib mfplat.lib "
- OutputFile="$(OutDir)\webmmfsource32.dll"
- LinkIncremental="1"
- GenerateManifest="false"
- ModuleDefinitionFile="webmmfsource.def"
- GenerateDebugInformation="false"
- SubSystem="0"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(SolutionDir)..\common;$(SolutionDir)..\..\libwebm"
- PreprocessorDefinitions="WIN64;_WINDOWS;_USRDLL;NOMINMAX"
- WarningLevel="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mf.lib mfuuid.lib mfplat.lib "
- OutputFile="$(OutDir)\webmmfsource64.dll"
- LinkIncremental="1"
- GenerateManifest="false"
- ModuleDefinitionFile="webmmfsource.def"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath=".\resource.h"
- >
- </File>
- <File
- RelativePath=".\webmmfsource.rc"
- >
- </File>
- </Filter>
- <Filter
- Name="Common Files"
- >
- <File
- RelativePath="..\..\common\cfactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\cfactory.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\clockable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\clockable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\comreg.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\comreg.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\iidstr.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\iidstr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\omahautil.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\omahautil.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\registry.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\versionhandling.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\versionhandling.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\vorbistypes.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\vorbistypes.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\webmtypes.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\webmtypes.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="libwebm"
- >
- <File
- RelativePath="..\..\..\libwebm\mkvparser.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\libwebm\mkvparser.hpp"
- >
- </File>
- <File
- RelativePath=".\mkvreader.cpp"
- >
- </File>
- <File
- RelativePath=".\mkvreader.hpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\dllentry.cpp"
- >
- </File>
- <File
- RelativePath=".\webmmfbytestreamhandler.cpp"
- >
- </File>
- <File
- RelativePath=".\webmmfbytestreamhandler.hpp"
- >
- </File>
- <File
- RelativePath=".\webmmfsource.cpp"
- >
- </File>
- <File
- RelativePath=".\webmmfsource.hpp"
- >
- </File>
- <File
- RelativePath=".\webmmfstream.cpp"
- >
- </File>
- <File
- RelativePath=".\webmmfstream.hpp"
- >
- </File>
- <File
- RelativePath=".\webmmfstreamaudio.cpp"
- >
- </File>
- <File
- RelativePath=".\webmmfstreamaudio.hpp"
- >
- </File>
- <File
- RelativePath=".\webmmfstreamvideo.cpp"
- >
- </File>
- <File
- RelativePath=".\webmmfstreamvideo.hpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/mediafoundation/webmmfvorbisdec/webmmfvorbisdec_2010.vcxproj b/mediafoundation/webmmfvorbisdec/webmmfvorbisdec.vcxproj
similarity index 97%
rename from mediafoundation/webmmfvorbisdec/webmmfvorbisdec_2010.vcxproj
rename to mediafoundation/webmmfvorbisdec/webmmfvorbisdec.vcxproj
index a120b5f..5074088 100644
--- a/mediafoundation/webmmfvorbisdec/webmmfvorbisdec_2010.vcxproj
+++ b/mediafoundation/webmmfvorbisdec/webmmfvorbisdec.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -28,19 +28,23 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/mediafoundation/webmmfvorbisdec/webmmfvorbisdec_2010.vcxproj.filters b/mediafoundation/webmmfvorbisdec/webmmfvorbisdec.vcxproj.filters
similarity index 100%
rename from mediafoundation/webmmfvorbisdec/webmmfvorbisdec_2010.vcxproj.filters
rename to mediafoundation/webmmfvorbisdec/webmmfvorbisdec.vcxproj.filters
diff --git a/mediafoundation/webmmfvorbisdec/webmmfvorbisdec_2008.vcproj b/mediafoundation/webmmfvorbisdec/webmmfvorbisdec_2008.vcproj
deleted file mode 100644
index b1cb24b..0000000
--- a/mediafoundation/webmmfvorbisdec/webmmfvorbisdec_2008.vcproj
+++ /dev/null
@@ -1,453 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="webmmfvorbisdec_2008"
- ProjectGUID="{560D4BFA-63B9-468E-8845-7705DE2FBDDF}"
- RootNamespace="webmmfvorbisdec"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)..\common";"$(SolutionDir)..\third_party\libogg";"$(SolutionDir)..\third_party\libvorbis";"$(SolutionDir)webmmftests";$(SolutionDir)..\third_party"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WEBMMFVORBISDEC_EXPORTS"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="4"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mfuuid.lib mfplat.lib libogg_static.lib libvorbis_static.lib"
- OutputFile="$(OutDir)\webmmfvorbisdec32.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories=""$(SolutionDir)..\third_party\libogg\x86\debug";"$(SolutionDir)..\third_party\libvorbis\x86\debug""
- GenerateManifest="false"
- IgnoreDefaultLibraryNames=""
- ModuleDefinitionFile="webmmfvorbisdec.def"
- GenerateDebugInformation="true"
- SubSystem="0"
- LinkTimeCodeGeneration="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)..\common";"$(SolutionDir)..\third_party\libogg";"$(SolutionDir)..\third_party\libvorbis";"$(SolutionDir)webmmftests";"$(SolutionDir)..\third_party""
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- WarningLevel="4"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mfuuid.lib mfplat.lib libogg_static.lib libvorbis_static.lib"
- OutputFile="$(OutDir)\webmmfvorbisdec64.dll"
- AdditionalLibraryDirectories=""$(SolutionDir)..\third_party\libogg\x64\debug";"$(SolutionDir)..\third_party\libvorbis\x64\debug""
- GenerateManifest="false"
- ModuleDefinitionFile="webmmfvorbisdec.def"
- GenerateDebugInformation="true"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(SolutionDir)..\common";"$(SolutionDir)..\third_party\libogg";"$(SolutionDir)..\third_party\libvorbis";"$(SolutionDir)webmmftests";"$(SolutionDir)..\third_party""
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- DebugInformationFormat="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mfuuid.lib mfplat.lib libogg_static.lib libvorbis_static.lib"
- OutputFile="$(OutDir)\webmmfvorbisdec32.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""$(SolutionDir)..\third_party\libogg\x86\release";"$(SolutionDir)..\third_party\libvorbis\x86\release""
- ModuleDefinitionFile="webmmfvorbisdec.def"
- GenerateDebugInformation="false"
- SubSystem="0"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)..\common";"$(SolutionDir)..\third_party\libogg";"$(SolutionDir)..\third_party\libvorbis";"$(SolutionDir)webmmftests";"$(SolutionDir)..\third_party""
- PreprocessorDefinitions="WIN64;_WINDOWS;_USRDLL;NOMINMAX"
- WarningLevel="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mfuuid.lib mfplat.lib libogg_static.lib libvorbis_static.lib"
- OutputFile="$(OutDir)\webmmfvorbisdec64.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""$(SolutionDir)..\third_party\libogg\x64\release";"$(SolutionDir)..\third_party\libvorbis\x64\release""
- GenerateManifest="false"
- ModuleDefinitionFile="webmmfvorbisdec.def"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="resources"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath=".\resource.h"
- >
- </File>
- <File
- RelativePath=".\webmmfvorbisdec.rc"
- >
- </File>
- </Filter>
- <Filter
- Name="common"
- >
- <File
- RelativePath="..\..\common\cfactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\cfactory.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\clockable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\clockable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\comreg.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\comreg.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\memutil.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\memutilfwd.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\vorbisdecoder.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\vorbisdecoder.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\vorbistypes.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\vorbistypes.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\webmtypes.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\webmtypes.hpp"
- >
- </File>
- </Filter>
- <Filter
- Name="third_party"
- >
- <Filter
- Name="ogg"
- >
- <File
- RelativePath="..\..\third_party\libogg\ogg\ogg.h"
- >
- </File>
- <File
- RelativePath="..\..\third_party\libogg\ogg\os_types.h"
- >
- </File>
- </Filter>
- <Filter
- Name="vorbis"
- >
- <File
- RelativePath="..\..\third_party\libvorbis\vorbis\codec.h"
- >
- </File>
- </Filter>
- </Filter>
- <Filter
- Name="webmmftests"
- >
- <File
- RelativePath="..\webmmftests\wfxrawwriter.cpp"
- >
- </File>
- <File
- RelativePath="..\webmmftests\wfxrawwriter.hpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\dllentry.cpp"
- >
- </File>
- <File
- RelativePath=".\webmmfvorbisdec.cpp"
- >
- </File>
- <File
- RelativePath=".\webmmfvorbisdec.hpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/mediafoundation/webmmfvp8dec/webmmfvp8dec_2010.vcxproj b/mediafoundation/webmmfvp8dec/webmmfvp8dec.vcxproj
similarity index 97%
rename from mediafoundation/webmmfvp8dec/webmmfvp8dec_2010.vcxproj
rename to mediafoundation/webmmfvp8dec/webmmfvp8dec.vcxproj
index 8dc8852..4fac48f 100644
--- a/mediafoundation/webmmfvp8dec/webmmfvp8dec_2010.vcxproj
+++ b/mediafoundation/webmmfvp8dec/webmmfvp8dec.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -28,18 +28,22 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/mediafoundation/webmmfvp8dec/webmmfvp8dec_2010.vcxproj.filters b/mediafoundation/webmmfvp8dec/webmmfvp8dec.vcxproj.filters
similarity index 100%
rename from mediafoundation/webmmfvp8dec/webmmfvp8dec_2010.vcxproj.filters
rename to mediafoundation/webmmfvp8dec/webmmfvp8dec.vcxproj.filters
diff --git a/mediafoundation/webmmfvp8dec/webmmfvp8dec_2008.vcproj b/mediafoundation/webmmfvp8dec/webmmfvp8dec_2008.vcproj
deleted file mode 100644
index 62d5428..0000000
--- a/mediafoundation/webmmfvp8dec/webmmfvp8dec_2008.vcproj
+++ /dev/null
@@ -1,399 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="webmmfvp8dec_2008"
- ProjectGUID="{288D8052-555F-4AED-8FB2-CA2EB34D5CBE}"
- RootNamespace="webmmfvp8dec"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(SolutionDir)..\common; $(SolutionDir)..\third_party\libvpx"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX"
- MinimalRebuild="false"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- BrowseInformation="1"
- WarningLevel="4"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mfuuid.lib evr_vista.lib mfplat_vista.lib vpxmtd.lib"
- OutputFile="$(OutDir)\webmmfvp8dec32.dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories="$(SolutionDir)..\third_party\libvpx\x86\debug"
- GenerateManifest="false"
- ModuleDefinitionFile="webmmfvp8dec.def"
- GenerateDebugInformation="true"
- SubSystem="0"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Debug|x64"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories="$(SolutionDir)..\common; $(SolutionDir)..\third_party\libvpx"
- PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;NOMINMAX"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- WarningLevel="4"
- DebugInformationFormat="1"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mfuuid.lib evr_vista.lib mfplat_vista.lib vpxmtd.lib"
- OutputFile="$(OutDir)\webmmfvp8dec64.dll"
- AdditionalLibraryDirectories="$(SolutionDir)..\third_party\libvpx\x64\debug"
- GenerateManifest="false"
- ModuleDefinitionFile="webmmfvp8dec.def"
- GenerateDebugInformation="true"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories="$(SolutionDir)..\common;$(SolutionDir)..\third_party\libvpx"
- PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NOMINMAX"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="false"
- UsePrecompiledHeader="0"
- WarningLevel="4"
- DebugInformationFormat="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mfuuid.lib evr_vista.lib mfplat_vista.lib vpxmt.lib"
- OutputFile="$(OutDir)\webmmfvp8dec32.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(SolutionDir)..\third_party\libvpx\x86\release"
- GenerateManifest="false"
- ModuleDefinitionFile="webmmfvp8dec.def"
- GenerateDebugInformation="false"
- SubSystem="0"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(SolutionDir)..\..\dll\webmmf\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)..\..\obj\$(SolutionName)\$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(SolutionDir)..\common;$(SolutionDir)..\third_party\libvpx"
- PreprocessorDefinitions="WIN64;_WINDOWS;_USRDLL;NOMINMAX"
- WarningLevel="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="mfuuid.lib evr_vista.lib mfplat_vista.lib vpxmt.lib"
- OutputFile="$(OutDir)\webmmfvp8dec64.dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories="$(SolutionDir)..\third_party\libvpx\x64\release"
- GenerateManifest="false"
- ModuleDefinitionFile="webmmfvp8dec.def"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- <File
- RelativePath=".\resource.h"
- >
- </File>
- <File
- RelativePath=".\webmmfvp8dec.rc"
- >
- </File>
- </Filter>
- <Filter
- Name="Common Files"
- >
- <File
- RelativePath="..\..\common\cfactory.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\cfactory.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\clockable.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\clockable.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\comreg.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\comreg.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\iidstr.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\iidstr.hpp"
- >
- </File>
- <File
- RelativePath="..\..\common\webmtypes.cpp"
- >
- </File>
- <File
- RelativePath="..\..\common\webmtypes.hpp"
- >
- </File>
- </Filter>
- <File
- RelativePath=".\dllentry.cpp"
- >
- </File>
- <File
- RelativePath=".\webmmfvp8dec.cpp"
- >
- </File>
- <File
- RelativePath=".\webmmfvp8dec.hpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
