diff options
| author | Nick <20588554+nicknsy@users.noreply.github.com> | 2023-06-28 21:43:23 -0700 |
|---|---|---|
| committer | Nick <20588554+nicknsy@users.noreply.github.com> | 2023-06-28 21:43:23 -0700 |
| commit | 6d9e43cfe03d94aec62a0b35743003fa4caa32b1 (patch) | |
| tree | a78b31f6743061f4c8bfa41985ae6b2574eaa06f /Jellyfin.Api/Helpers/StreamingHelpers.cs | |
| parent | fc619337481e3bb0f686aee06d9c5630926baaef (diff) | |
| parent | 76939bbd9bebb622759422f262c2490b56ab5a16 (diff) | |
Merge branch 'master' into trickplay
Diffstat (limited to 'Jellyfin.Api/Helpers/StreamingHelpers.cs')
| -rw-r--r-- | Jellyfin.Api/Helpers/StreamingHelpers.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Jellyfin.Api/Helpers/StreamingHelpers.cs b/Jellyfin.Api/Helpers/StreamingHelpers.cs index 9c91dcc6f..782cd6568 100644 --- a/Jellyfin.Api/Helpers/StreamingHelpers.cs +++ b/Jellyfin.Api/Helpers/StreamingHelpers.cs @@ -430,12 +430,17 @@ public static class StreamingHelpers { var videoCodec = state.Request.VideoCodec; - if (string.Equals(videoCodec, "h264", StringComparison.OrdinalIgnoreCase) || - string.Equals(videoCodec, "hevc", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(videoCodec, "h264", StringComparison.OrdinalIgnoreCase)) { return ".ts"; } + if (string.Equals(videoCodec, "hevc", StringComparison.OrdinalIgnoreCase) + || string.Equals(videoCodec, "av1", StringComparison.OrdinalIgnoreCase)) + { + return ".mp4"; + } + if (string.Equals(videoCodec, "theora", StringComparison.OrdinalIgnoreCase)) { return ".ogv"; |