diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-11-19 00:01:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-19 00:01:21 -0500 |
| commit | e221810bfc6701298692d648c8b68a5214e72cba (patch) | |
| tree | f17289262fa45c538c82eeada7e63c19dbb821fb /Emby.Server.Implementations | |
| parent | fd5059147da5d3d227f0a9c6ff9b301265a0ff48 (diff) | |
| parent | 43cb11f694210de6e2666665a3d9c7f33a6eacd3 (diff) | |
Merge pull request #3023 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs index a3bfff7c1..fc9244f6a 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs @@ -65,10 +65,13 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts var requiresRemux = false; var contentType = response.ContentType ?? string.Empty; - if (contentType.IndexOf("mp4", StringComparison.OrdinalIgnoreCase) != -1 || - contentType.IndexOf("matroska", StringComparison.OrdinalIgnoreCase) != -1 || - contentType.IndexOf("dash", StringComparison.OrdinalIgnoreCase) != -1 || - contentType.IndexOf("mpegURL", StringComparison.OrdinalIgnoreCase) != -1) + if (contentType.IndexOf("matroska", StringComparison.OrdinalIgnoreCase) != -1) + { + extension = "mkv"; + } + else if (contentType.IndexOf("mp4", StringComparison.OrdinalIgnoreCase) != -1 || + contentType.IndexOf("dash", StringComparison.OrdinalIgnoreCase) != -1 || + contentType.IndexOf("mpegURL", StringComparison.OrdinalIgnoreCase) != -1) { requiresRemux = true; } |