diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-10-17 15:00:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 15:00:43 +0100 |
| commit | 63be65dd919f1e628452c64f0fae7a7f035bce96 (patch) | |
| tree | 8bf19d708cef1f5667ec938ab704859b223d0d97 /MediaBrowser.Model/System/SystemInfo.cs | |
| parent | 68de105dc21f4d1114a3b1db81f177caae747ef6 (diff) | |
| parent | 49ac4c4044b1777dc3a25544aead7b0b15b953e8 (diff) | |
Merge branch 'master' into Comment1
Diffstat (limited to 'MediaBrowser.Model/System/SystemInfo.cs')
| -rw-r--r-- | MediaBrowser.Model/System/SystemInfo.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index 18ca74ee3..4b83fb7e6 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -14,13 +14,16 @@ namespace MediaBrowser.Model.System { /// <summary>No path to FFmpeg found.</summary> NotFound, + /// <summary>Path supplied via command line using switch --ffmpeg.</summary> SetByArgument, + /// <summary>User has supplied path via Transcoding UI page.</summary> Custom, + /// <summary>FFmpeg tool found on system $PATH.</summary> System - }; + } /// <summary> /// Class SystemInfo. |