Murzaby/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-10 10:54:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Backport pull request #12374 from jellyfin/release-10.9.z

Browse source 
Fix compatibility between TranscodingThrottler and FFmpeg 7.0

Original-merge: ee0094d889

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
This commit is contained in:
nyanmisaka 2024-08-05 11:01:28 -04:00 • committed by Bond_009
parent 0675b06bea
commit 7ee9c9b7a0
5 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View file

@ -194,7 +194,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
_threads = EncodingHelper.GetNumberOfThreads(null, options, null);
_isPkeyPauseSupported = validator.CheckSupportedRuntimeKey("p pause transcoding");
_isPkeyPauseSupported = validator.CheckSupportedRuntimeKey("p pause transcoding", _ffmpegVersion);
_isLowPriorityHwDecodeSupported = validator.CheckSupportedHwaccelFlag("low_priority");
// Check the Vaapi device vendor