mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-16 05:43:54 +03:00
[PR #4963] [CLOSED] Fix for 4933: FFMPeg detection. #10344
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/jellyfin/jellyfin/pull/4963
Author: @BaronGreenback
Created: 1/6/2021
Status: ❌ Closed
Base:
master← Head:ffmpegFix📝 Commits (10+)
1921a36fix5c656c9Changed to bool98a4de7changed comment68c4294Update MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs99fe722Update MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs41b8d6fUpdate MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs4092a4bUpdate tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.csb20a516renamed method and variable names.157cb84added warning0caeee1Corrected tests📊 Changes
3 files changed (+110 additions, -34 deletions)
View changed files
📝
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs(+62 -14)📝
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs(+32 -19)📝
tests/Jellyfin.MediaEncoding.Tests/EncoderValidatorTests.cs(+16 -1)📄 Description
If a version of ffmpeg is discovered that is outside the recommended version - this continues to look for a better one.
Also fixes https://github.com/jellyfin/jellyfin/issues/4933, whereby a version being outside of the recommended results in no version being selected, as function returns false.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.