diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-05 09:51:55 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-02-05 09:51:55 -0500 |
| commit | 64eb8c82a3e82d84ac827aa35a55fdface9ac783 (patch) | |
| tree | f33bd359dbd11d97a2b73146facb1766d5fe1fc2 | |
| parent | 04d62d3420a2bbbf678ccb20e86938a4522e8097 (diff) | |
| parent | 890b011f5e5d6790eeaf5901f9919c758f2d6b6b (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs index 7924b57d8..708e85d4d 100644 --- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs +++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs @@ -136,10 +136,14 @@ namespace MediaBrowser.Api.Playback.Progressive { contentFeatures = "DLNA.ORG_PN=AVI"; } - //else if (string.Equals(extension, ".mp4", StringComparison.OrdinalIgnoreCase)) - //{ - // contentFeatures = "DLNA.ORG_PN=MPEG4_P2_SP_AAC"; - //} + else if (string.Equals(extension, ".mkv", StringComparison.OrdinalIgnoreCase)) + { + contentFeatures = "DLNA.ORG_PN=MATROSKA"; + } + else if (string.Equals(extension, ".mp4", StringComparison.OrdinalIgnoreCase)) + { + 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"; @@ -153,11 +157,7 @@ namespace MediaBrowser.Api.Playback.Progressive // // ?? // contentFeatures = "DLNA.ORG_PN=WMVHIGH_BASE"; //} - //else if (string.Equals(extension, ".mkv", StringComparison.OrdinalIgnoreCase)) - //{ - // // ?? - // contentFeatures = ""; - //} + if (!string.IsNullOrEmpty(contentFeatures)) { |