Merge branch 'MP1-5041_Update_FFmpeg_to_4.1.1' into 1.26.Pre-Test5

# Conflicts: # TvEngine3/TVLibrary/TvThumbnails/TvThumbnails.csproj # TvEngine3/TVLibrary/TvThumbnails/packages.config # mediaportal/Core/Core.csproj # mediaportal/Core/packages.config
MediaPortal · Sep 7, 2020 · 30bb9ab · 30bb9ab
2 parents eb5c067 + 1ac7403
commit 30bb9ab
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 4 deletions.
diff --git a/TvEngine3/TVLibrary/Setup/setup.nsi b/TvEngine3/TVLibrary/Setup/setup.nsi
@@ -555,7 +555,7 @@ ${MementoSection} "MediaPortal TV Server" SecServer
   File "${git_ROOT}\Packages\MediaInfo.Wrapper.20.8.0\lib\net40\MediaInfo.Wrapper.dll"
 
   ; thumbnail software
-  File "${git_ROOT}\Packages\ffmpeg.2.7.1\ffmpeg.exe"
+  File "${git_ROOT}\Packages\FFmpeg.Win32.Static.4.1.1.1\ffmpeg\ffmpeg.exe"
   File "${git_TVServer}\TvThumbnails\bin\x86\${BUILD_TYPE}\TvThumbnails.dll"
 
 

diff --git a/TvEngine3/TVLibrary/TvThumbnails/TvThumbnails.csproj b/TvEngine3/TVLibrary/TvThumbnails/TvThumbnails.csproj
@@ -103,7 +103,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\..\Packages\MediaInfo.Native.20.8.1\build\MediaInfo.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Packages\MediaInfo.Native.20.8.1\build\MediaInfo.Native.targets'))" />
+    <Error Condition="!Exists('..\..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets'))" />
   </Target>
+  <Import Project="..\..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets" Condition="Exists('..\..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/TvEngine3/TVLibrary/TvThumbnails/packages.config b/TvEngine3/TVLibrary/TvThumbnails/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="MediaInfo.Native" version="20.8.1" targetFramework="net40" />
   <package id="MediaInfo.Wrapper" version="20.8.0" targetFramework="net40" />
+  <package id="FFmpeg.Win32.Static" version="4.1.1.1" targetFramework="net40" />
 </packages>
diff --git a/mediaportal/Core/Core.csproj b/mediaportal/Core/Core.csproj
@@ -1702,7 +1702,9 @@ xcopy "$(TargetDir)core.*" "$(SolutionDir)MediaPortal.Application\bin\$(Configur
     </PropertyGroup>
     <Error Condition="!Exists('..\..\Packages\BASSCombined.2.4.15\build\basscombined.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\BASSCombined.2.4.15\build\basscombined.targets'))" />
     <Error Condition="!Exists('..\..\Packages\MediaInfo.Native.20.8.1\build\MediaInfo.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\MediaInfo.Native.20.8.1\build\MediaInfo.Native.targets'))" />
+    <Error Condition="!Exists('..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets'))" />
   </Target>
   <Import Project="..\..\Packages\BASSCombined.2.4.15\build\basscombined.targets" Condition="Exists('..\..\Packages\BASSCombined.2.4.15\build\basscombined.targets')" />
   <Import Project="..\..\Packages\MediaInfo.Native.20.8.1\build\MediaInfo.Native.targets" Condition="Exists('..\..\Packages\MediaInfo.Native.20.8.1\build\MediaInfo.Native.targets')" />
+  <Import Project="..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets" Condition="Exists('..\..\Packages\FFmpeg.Win32.Static.4.1.1.1\build\FFmpeg.Win32.Static.targets')" />
 </Project>
diff --git a/mediaportal/Core/packages.config b/mediaportal/Core/packages.config
@@ -4,7 +4,7 @@
   <package id="BASSCombined" version="2.4.15" targetFramework="net40" />
   <package id="BassRegistration" version="2.4.14.1" targetFramework="net40" />
   <package id="CSCore" version="1.2.1.2" targetFramework="net40" />
-  <package id="ffmpeg" version="2.7.1" targetFramework="net40" />
+  <package id="FFmpeg.Win32.Static" version="4.1.1.1" targetFramework="net40" />
   <package id="MediaInfo.Native" version="20.8.1" targetFramework="net40" />
   <package id="MediaInfo.Wrapper" version="20.8.0" targetFramework="net40" />
   <package id="MediaPortal.TagLib" version="2.1.0.2" targetFramework="net40" />

diff --git a/mediaportal/MediaPortal.Application/PostBuild.bat b/mediaportal/MediaPortal.Application/PostBuild.bat
@@ -174,7 +174,7 @@ xcopy %1\..\Packages\MetadataExtractor.2.4.3\lib\net35\MetadataExtractor.dll . /
 xcopy %1\..\Packages\XmpCore.6.1.10\lib\net35\XmpCore.dll . /Y /D
 
 REM ffmpeg 
-xcopy %1\..\Packages\ffmpeg.2.7.1\ffmpeg.exe MovieThumbnailer\ /Y /D
+xcopy %1\..\Packages\FFmpeg.Win32.Static.4.1.1.1\ffmpeg\ffmpeg.exe MovieThumbnailer\ /Y /D
 
 REM Bass Core
 xcopy %1\core\bin\%2\Bass.Net.dll . /Y /D

diff --git a/mediaportal/Setup/setup.nsi b/mediaportal/Setup/setup.nsi
@@ -578,7 +578,7 @@ Section "MediaPortal core files (required)" SecCore
   File "${git_MP}\WindowPlugins\Common.GUIPlugins\bin\${BUILD_TYPE}\Common.GUIPlugins.dll"
   ; ffmpeg
   SetOutPath "$MPdir.Base\MovieThumbnailer"
-  File "${git_ROOT}\Packages\ffmpeg.2.7.1\ffmpeg.exe"
+  File "${git_ROOT}\Packages\FFmpeg.Win32.Static.4.1.1.1\ffmpeg\ffmpeg.exe"
   ; NuGet binaries MediaInfo
   SetOutPath "$MPdir.Base\"
   File "${git_ROOT}\Packages\MediaInfo.Native.20.8.1\build\native\x86\MediaInfo.dll"