use ffmpeg 7.1.1 on windows (#2031)
This commit is contained in:
@@ -178,7 +178,7 @@ jobs:
|
||||
id: downloadffmpeg
|
||||
name: Download ffmpeg
|
||||
with:
|
||||
url: "https://github.com/ErsatzTV/ErsatzTV-ffmpeg/releases/download/6.1-working-cuvid/ffmpeg-6.1-working-cuvid.7z"
|
||||
url: "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2025-06-12-14-05/ffmpeg-n7.1.1-22-g0f1fe3d153-win64-gpl-7.1.zip"
|
||||
target: ffmpeg/
|
||||
|
||||
- name: Build
|
||||
|
||||
@@ -35,6 +35,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||
- If the ping is successful, the address will be cached for another 30 seconds
|
||||
- If the ping is not successful, all addresses will be checked again, and the first address to return a successful ping will be cached for 30 seconds
|
||||
- Remove requirement to have Jellyfin admin user; user id is no longer required on requests to latest Jellyfin server
|
||||
- Upgrade bundled ffmpeg on Windows from 6.1 to 7.1.1
|
||||
|
||||
### Fixed
|
||||
- Fix error message about synchronizing Plex collections from a Plex server that has zero collections
|
||||
|
||||
@@ -10,7 +10,7 @@ public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthChe
|
||||
{
|
||||
private const string BundledVersion = "6.1";
|
||||
private const string BundledVersionVaapi = "6.1";
|
||||
private const string WindowsVersionPrefix = "n6.1";
|
||||
private const string WindowsVersionPrefix = "n7.1.1";
|
||||
|
||||
private static readonly string[] FFmpegVersionArguments = { "-version" };
|
||||
|
||||
@@ -84,6 +84,7 @@ public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthChe
|
||||
}
|
||||
|
||||
if (!version.StartsWith("6.1", StringComparison.OrdinalIgnoreCase) &&
|
||||
!version.StartsWith("7.1.1", StringComparison.OrdinalIgnoreCase) &&
|
||||
!version.StartsWith(WindowsVersionPrefix, StringComparison.OrdinalIgnoreCase) &&
|
||||
version != BundledVersion &&
|
||||
version != BundledVersionVaapi)
|
||||
|
||||
Reference in New Issue
Block a user