- Update to FFmpeg 4.0.

- Update to Windows 10 SDK Build 17134. - Add ARM64 build support.
M2TeamArchived · May 4, 2018 · 9628ce8 · 9628ce8
1 parent 32b7b87
commit 9628ce8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 111 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 /Output
 /FFmpeg
 /FFmpegUniversal/FFmpeg
+/FFmpegUniversalSDK/ARM64
 /FFmpegUniversalSDK/ARM
 /FFmpegUniversalSDK/Win32
 /FFmpegUniversalSDK/x64

diff --git a/FFmpegBuild.bat b/FFmpegBuild.bat
@@ -11,7 +11,7 @@ rem Set the MSYS2 bash path
 set MSYS2_BIN="E:\Tools\msys64\usr\bin\bash.exe"
 
 rem Set the Windows SDK version
-set WindowsSDKversion=10.0.10240.0
+set WindowsSDKversion=10.0.17134.0
 
 set VSInstallerFolder="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer"
 if %PROCESSOR_ARCHITECTURE%==x86 set VSInstallerFolder="%ProgramFiles%\Microsoft Visual Studio\Installer"
@@ -66,8 +66,6 @@ call "%VS2017InstallDir%\VC\Auxiliary\Build\vcvarsall.bat" x86_arm uwp %WindowsS
 call "%~dp0FFmpegCopy.bat" ARM
 endlocal
 
-goto Cleanup
-
 echo Building FFmpeg for Windows 10 apps ARM64...
 echo:
 

diff --git a/FFmpegUniversal.sln b/FFmpegUniversal.sln
@@ -18,17 +18,17 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FFmpegUniversalSDK", "FFmpegUniversalSDK\FFmpegUniversalSDK.vcxitems", "{B4F7B4B6-D656-4FB5-A988-C62B38A3540C}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		FFmpegUniversalSDK\FFmpegUniversalSDK.vcxitems*{b4f7b4b6-d656-4fb5-a988-c62b38a3540c}*SharedItemsImports = 9
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{BB79FD8C-5A98-47E7-97A2-0F8F6611271B}.Release|ARM.ActiveCfg = Release|ARM
 		{BB79FD8C-5A98-47E7-97A2-0F8F6611271B}.Release|ARM.Build.0 = Release|ARM
+		{BB79FD8C-5A98-47E7-97A2-0F8F6611271B}.Release|ARM64.ActiveCfg = Release|ARM64
+		{BB79FD8C-5A98-47E7-97A2-0F8F6611271B}.Release|ARM64.Build.0 = Release|ARM64
 		{BB79FD8C-5A98-47E7-97A2-0F8F6611271B}.Release|x64.ActiveCfg = Release|x64
 		{BB79FD8C-5A98-47E7-97A2-0F8F6611271B}.Release|x64.Build.0 = Release|x64
 		{BB79FD8C-5A98-47E7-97A2-0F8F6611271B}.Release|x86.ActiveCfg = Release|Win32

diff --git a/FFmpegUniversal/FFmpegUniversal.aps b/FFmpegUniversal/FFmpegUniversal.aps
diff --git a/FFmpegUniversal/FFmpegUniversal.vcxproj b/FFmpegUniversal/FFmpegUniversal.vcxproj
@@ -1,10 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|ARM">
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -22,27 +26,15 @@
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
     <ProjectName>FFmpegUniversal</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+  <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
+	<UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
@@ -51,106 +43,23 @@
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ImportGroup 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 />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <PropertyGroup>
     <GenerateManifest>false</GenerateManifest>
     <IgnoreImportLibrary>false</IgnoreImportLibrary>
     <OutDir>$(SolutionDir)FFmpegUniversalSDK\$(Platform)\</OutDir>
     <IntDir>$(SolutionDir)Output\$(MSBuildProjectName)_Temp\$(Platform)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-    <OutDir>$(SolutionDir)FFmpegUniversalSDK\$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)Output\$(MSBuildProjectName)_Temp\$(Platform)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-    <OutDir>$(SolutionDir)FFmpegUniversalSDK\$(Platform)\</OutDir>
-    <IntDir>$(SolutionDir)Output\$(MSBuildProjectName)_Temp\$(Platform)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
-      <Optimization>MinSpace</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
+  <ItemDefinitionGroup>
     <Link>
       <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
       <ModuleDefinitionFile>$(ProjectDir)FFmpeg\Lib\$(Platform)\FFmpegUniversal.def</ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-    <PreBuildEvent />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <Optimization>MinSpace</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <ModuleDefinitionFile>$(ProjectDir)FFmpeg\Lib\$(Platform)\FFmpegUniversal.def</ModuleDefinitionFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-    <PreBuildEvent />
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <Optimization>MinSpace</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <ModuleDefinitionFile>$(ProjectDir)FFmpeg\Lib\$(Platform)\FFmpegUniversal.def</ModuleDefinitionFile>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
     </Link>
-    <PreBuildEvent />
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="Version.h" />

diff --git a/FFmpegUniversal/Version.h b/FFmpegUniversal/Version.h
@@ -8,9 +8,9 @@ License: LGPL version 2.1 or later
 #ifndef FFMPEG_VER
 #define FFMPEG_VER
 
-#define FFMPEG_VER_MAJOR 3
-#define FFMPEG_VER_MINOR 4
-#define FFMPEG_VER_BUILD 2
+#define FFMPEG_VER_MAJOR 4
+#define FFMPEG_VER_MINOR 0
+#define FFMPEG_VER_BUILD 0
 #define FFMPEG_VER_REV 0
 #endif