Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for 4933: Alternative ffmpeg fix #5073

Merged
merged 1 commit into from Feb 27, 2021
Merged

Conversation

@BaronGreenback
Copy link
Contributor

@BaronGreenback BaronGreenback commented Jan 21, 2021

This method returns true if any version of ffmpeg if located, on a first come basis.

Alternative to #4963

@BaronGreenback BaronGreenback changed the title Alternative ffmpeg fix Fix for 4933: Alternative ffmpeg fix Feb 26, 2021
@crobibero crobibero added this to Active PRs in Release 10.7.0 via automation Feb 27, 2021
@cvium
cvium approved these changes Feb 27, 2021
@cvium cvium merged commit e5f9976 into jellyfin:master Feb 27, 2021
12 checks passed
12 checks passed
Analyze (csharp) Analyze (csharp)
Details
CodeQL No new alerts
Details
Jellyfin Server Build #20210121.1 succeeded
Details
Jellyfin Server (Build Debug) Build Debug succeeded
Details
Jellyfin Server (Build Release) Build Release succeeded
Details
Jellyfin Server (Compatibility Check Common) Compatibility Check Common succeeded
Details
Jellyfin Server (Compatibility Check Controller) Compatibility Check Controller succeeded
Details
Jellyfin Server (Compatibility Check Model) Compatibility Check Model succeeded
Details
Jellyfin Server (Compatibility Check Naming) Compatibility Check Naming succeeded
Details
Jellyfin Server (Test Linux) Test Linux succeeded
Details
Jellyfin Server (Test Windows) Test Windows succeeded
Details
Jellyfin Server (Test macOS) Test macOS succeeded
Details
Release 10.7.0 automation moved this from Active PRs to Completed PRs Feb 27, 2021
joshuaboniface added a commit that referenced this pull request Feb 28, 2021
Fix for 4933: Alternative ffmpeg fix

(cherry picked from commit e5f9976)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
@joshuaboniface joshuaboniface moved this from Completed PRs to Jellyfinished in Release 10.7.0 Feb 28, 2021
@BaronGreenback BaronGreenback deleted the BaronGreenback:ffmpeg branch Feb 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Release 10.7.0
  
Jellyfinished
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants