aboutsummaryrefslogtreecommitdiff
path: root/tests/Jellyfin.MediaEncoding.Tests/FFprobeParserTests.cs
diff options
context:
space:
mode:
authorcrobibero <cody@robibe.ro>2020-08-31 08:00:05 -0600
committercrobibero <cody@robibe.ro>2020-08-31 08:00:05 -0600
commitbd66fd25df772f3fd352fdda58e71474e255400a (patch)
treea6102da6a9f120d7c887f460c5d603be92ea199f /tests/Jellyfin.MediaEncoding.Tests/FFprobeParserTests.cs
parent9626101c9f8d0acceb2ecf97bed502c272d6e4f6 (diff)
parent0424d09b8daf3626fd7de65b601e707afdb00599 (diff)
Merge remote-tracking branch 'upstream/master' into 3.1.7
Diffstat (limited to 'tests/Jellyfin.MediaEncoding.Tests/FFprobeParserTests.cs')
-rw-r--r--tests/Jellyfin.MediaEncoding.Tests/FFprobeParserTests.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/Jellyfin.MediaEncoding.Tests/FFprobeParserTests.cs b/tests/Jellyfin.MediaEncoding.Tests/FFprobeParserTests.cs
index 2032f6cec..c39ef0ce9 100644
--- a/tests/Jellyfin.MediaEncoding.Tests/FFprobeParserTests.cs
+++ b/tests/Jellyfin.MediaEncoding.Tests/FFprobeParserTests.cs
@@ -1,6 +1,7 @@
using System.IO;
using System.Text.Json;
using System.Threading.Tasks;
+using MediaBrowser.Common.Json;
using MediaBrowser.MediaEncoding.Probing;
using Xunit;
@@ -15,7 +16,7 @@ namespace Jellyfin.MediaEncoding.Tests
var path = Path.Join("Test Data", fileName);
using (var stream = File.OpenRead(path))
{
- await JsonSerializer.DeserializeAsync<InternalMediaInfoResult>(stream).ConfigureAwait(false);
+ await JsonSerializer.DeserializeAsync<InternalMediaInfoResult>(stream, JsonDefaults.GetOptions()).ConfigureAwait(false);
}
}
}