diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-19 23:51:53 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-19 23:51:53 -0500 |
| commit | 120c8bcbb9381086bf9171eae1ba2df9b3c11bde (patch) | |
| tree | 85cfd4e95b46d1fa5e4ba037cc77e08ba15fac82 | |
| parent | 4a39df98cdd56505db5eea61d29509179cd9e48e (diff) | |
| parent | fc2faafc103e0048401d7359b7c2f8705907eaa7 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs index b8decb506..960424373 100644 --- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs +++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs @@ -146,10 +146,14 @@ namespace MediaBrowser.Api.Playback.Progressive { contentFeatures = "DLNA.ORG_PN=AVC_MP4_MP_HD_720p_AAC"; } - //else if (string.Equals(extension, ".mpeg", StringComparison.OrdinalIgnoreCase)) - //{ - // contentFeatures = "DLNA.ORG_PN=MPEG_PS_PAL"; - //} + else if (string.Equals(extension, ".mpeg", StringComparison.OrdinalIgnoreCase)) + { + contentFeatures = "DLNA.ORG_PN=MPEG_PS_PAL"; + } + else if (string.Equals(extension, ".ts", StringComparison.OrdinalIgnoreCase)) + { + contentFeatures = "DLNA.ORG_PN=MPEG_PS_PAL"; + } //else if (string.Equals(extension, ".wmv", StringComparison.OrdinalIgnoreCase)) //{ // contentFeatures = "DLNA.ORG_PN=WMVHIGH_BASE"; |