diff options
| author | artiume <siderite@gmail.com> | 2020-02-04 06:02:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 06:02:38 -0500 |
| commit | 3b6a4c3a33956eb54a0168f461b0279c4d3c1719 (patch) | |
| tree | 745336d36a86e689d06250f8867d809a937d24aa /MediaBrowser.Controller/MediaEncoding/JobLogger.cs | |
| parent | d4470b5709eaddae12c0096634bd47d7f9ec0b97 (diff) | |
| parent | 176e8509739ffd3d7002c94adbd814c33b5172e2 (diff) | |
Merge pull request #11 from jellyfin/master
nightly
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/JobLogger.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/JobLogger.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs index 171aedb0e..c9f64c707 100644 --- a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs +++ b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; -using MediaBrowser.Model.Extensions; using Microsoft.Extensions.Logging; namespace MediaBrowser.Controller.MediaEncoding @@ -90,6 +89,15 @@ namespace MediaBrowser.Controller.MediaEncoding framerate = val; } } + else if (part.StartsWith("fps=", StringComparison.OrdinalIgnoreCase)) + { + var rate = part.Split(new[] { '=' }, 2)[^1]; + + if (float.TryParse(rate, NumberStyles.Any, _usCulture, out var val)) + { + framerate = val; + } + } else if (state.RunTimeTicks.HasValue && part.StartsWith("time=", StringComparison.OrdinalIgnoreCase)) { |
