aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Playback/StreamState.cs
diff options
context:
space:
mode:
authorTim Hobbs <jesus.tesh@gmail.com>2014-03-24 09:37:44 -0700
committerTim Hobbs <jesus.tesh@gmail.com>2014-03-24 09:37:44 -0700
commit38a0af6e86d3bdf8794343b03d26659d4bf89093 (patch)
treef3c92b89ae3e8a7e744ee13eb1b16139da690622 /MediaBrowser.Api/Playback/StreamState.cs
parent543ce24c1051d10b32c0dae5277ee37c27daceae (diff)
parent501dedb13cd59dc2683ac4192cd11289bd304cfb (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'MediaBrowser.Api/Playback/StreamState.cs')
-rw-r--r--MediaBrowser.Api/Playback/StreamState.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index 88daf9f62..ecc5c93ef 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -79,16 +79,6 @@ namespace MediaBrowser.Api.Playback
public string GetMimeType(string outputPath)
{
- if (!string.IsNullOrWhiteSpace(Request.ForcedMimeType))
- {
- if (VideoRequest == null)
- {
- return "audio/" + Request.ForcedMimeType;
- }
-
- return "video/" + Request.ForcedMimeType;
- }
-
return MimeTypes.GetMimeType(outputPath);
}
}