mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-07-16 05:43:54 +03:00
[PR #3480] [MERGED] Respect FFMpeg path passed via Environment Variable #9554
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/3480
Author: @neilsb
Created: 6/29/2020
Status: ✅ Merged
Merged: 6/30/2020
Merged by: @anthonylavado
Base:
master← Head:ffmpeg-env-var📝 Commits (3)
4389773Respect FFMpeg path passed via Environment Variable4748df2Remove un-needed comment6b532b3User string.Empty instead of ""📊 Changes
4 files changed (+15 additions, -6 deletions)
View changed files
📝
Emby.Server.Implementations/ApplicationHost.cs(+1 -3)📝
Jellyfin.Server/StartupOptions.cs(+5 -0)📝
MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs(+5 -0)📝
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs(+4 -3)📄 Description
Fix issue whereby
JELLYFIN_FFMPEGenvironment variable was ignored.Changes
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.