aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs
diff options
context:
space:
mode:
authorPloughPuff <ploughpuff@protonmail.com>2019-02-08 13:35:26 +0000
committerPloughpuff <ploughpuff@protonmail.com>2019-03-05 21:24:54 +0000
commit20775116f76b12bf77672fa37c4ea5f82b69f157 (patch)
tree1a48e91f9d890c9a623e3e0aa95ab95ff50e3d64 /Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs
parent5587dd8bfb93971f0a9a93006567f528c3530f50 (diff)
Reworked FFmpeg path discovery and always display to user
1) Reworked FFmpeg and FFprobe path discovery (CLI switch, Custom xml, system $PATH, UI update trigger). Removed FFMpeg folder from Emby.Server.Implementations. All path discovery now in MediaEncoder. 2) Always display FFmpeg path to user in Transcode page. 3) Allow user to remove a Custome FFmpeg path and return to using system $PATH (or --ffmpeg if available). 4) Remove unused code associated with 'prebuilt' FFmpeg. 5) Much improved logging during path discovery.
Diffstat (limited to 'Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs')
-rw-r--r--Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs17
1 files changed, 0 insertions, 17 deletions
diff --git a/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs b/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs
deleted file mode 100644
index fa9cb5e01b..0000000000
--- a/Emby.Server.Implementations/FFMpeg/FFMpegInstallInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace Emby.Server.Implementations.FFMpeg
-{
- public class FFMpegInstallInfo
- {
- public string Version { get; set; }
- public string FFMpegFilename { get; set; }
- public string FFProbeFilename { get; set; }
- public string ArchiveType { get; set; }
-
- public FFMpegInstallInfo()
- {
- Version = "Path";
- FFMpegFilename = "ffmpeg";
- FFProbeFilename = "ffprobe";
- }
- }
-}