diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-10-14 19:05:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-14 19:05:57 +0100 |
| commit | 5b8349b4426b2eaa5ac812bf86a89eb3febd2c40 (patch) | |
| tree | 893d00fddfdd52ba1ff69f56e3d2d5bce1bdb74a /MediaBrowser.Model/System | |
| parent | a8cee0bd36278035135bf871f25c126a12fde9ef (diff) | |
| parent | d54de29485cc622a64c17884b39c9bc65e33af29 (diff) | |
Merge branch 'master' into fordiscussion
Diffstat (limited to 'MediaBrowser.Model/System')
| -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. |