diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2021-04-20 18:10:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 18:10:38 +0100 |
| commit | f8b717e7c51a771b937312af3f1aa77e044b86ce (patch) | |
| tree | 1de949627db1b7b033ea47e34ae5d7e2a8a70bd3 /MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs | |
| parent | 7848ea148438baf8929e1c2939e6979cb84aad1a (diff) | |
| parent | 5a6e60b414046c274330479f7dfb9713eea20020 (diff) | |
Merge branch 'master' into ProfileMatch
Diffstat (limited to 'MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs index b2d4db894..da37687e8 100644 --- a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs +++ b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; namespace MediaBrowser.MediaEncoding.Probing { @@ -85,12 +86,14 @@ namespace MediaBrowser.MediaEncoding.Probing { var val = GetDictionaryValue(tags, key); - if (!string.IsNullOrEmpty(val)) + if (string.IsNullOrEmpty(val)) { - if (DateTime.TryParse(val, out var i)) - { - return i.ToUniversalTime(); - } + return null; + } + + if (DateTime.TryParse(val, DateTimeFormatInfo.CurrentInfo, DateTimeStyles.AssumeUniversal, out var i)) + { + return i.ToUniversalTime(); } return null; |
