diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-09-25 22:24:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-25 22:24:57 +0200 |
| commit | 8858d8e59789ee3ad7b55077900d80437ef982b5 (patch) | |
| tree | b53f72bc270c09b33ff6d5eb4e57cd902ccad4a8 /MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs | |
| parent | 19b8bcaec43835c698a35975a748c2129c1413aa (diff) | |
| parent | 82cb6851786d4fb24952d77d869f9e9c005a960a (diff) | |
Merge branch 'master' into theorydata
Diffstat (limited to 'MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs index 9196fe1397..a9e753726d 100644 --- a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs +++ b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs @@ -63,10 +63,10 @@ namespace MediaBrowser.MediaEncoding.Probing public static DateTime? GetDictionaryDateTime(IReadOnlyDictionary<string, string> tags, string key) { if (tags.TryGetValue(key, out var val) - && (DateTime.TryParse(val, DateTimeFormatInfo.CurrentInfo, DateTimeStyles.AssumeUniversal, out var dateTime) - || DateTime.TryParseExact(val, "yyyy", DateTimeFormatInfo.CurrentInfo, DateTimeStyles.AssumeUniversal, out dateTime))) + && (DateTime.TryParse(val, DateTimeFormatInfo.CurrentInfo, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out var dateTime) + || DateTime.TryParseExact(val, "yyyy", DateTimeFormatInfo.CurrentInfo, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out dateTime))) { - return dateTime.ToUniversalTime(); + return dateTime; } return null; |
