aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-11-18 23:59:34 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-11-18 23:59:34 -0500
commit43cb11f694210de6e2666665a3d9c7f33a6eacd3 (patch)
treef17289262fa45c538c82eeada7e63c19dbb821fb /Emby.Server.Implementations
parent61dcc42e80dee7d9254d97d50a38360203d1da7b (diff)
update shared stream support
Diffstat (limited to 'Emby.Server.Implementations')
-rw-r--r--Emby.Server.Implementations/LiveTv/TunerHosts/SharedHttpStream.cs11
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 a3bfff7c17..fc9244f6a5 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;
}