lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Luke Pulverenti 2014-02-05 09:51:55 -05:00
commit 64eb8c82a3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
View File

@ -136,10 +136,14 @@ namespace MediaBrowser.Api.Playback.Progressive
{ {
contentFeatures = "DLNA.ORG_PN=AVI"; contentFeatures = "DLNA.ORG_PN=AVI";
} }
//else if (string.Equals(extension, ".mp4", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(extension, ".mkv", StringComparison.OrdinalIgnoreCase))
//{ {
// contentFeatures = "DLNA.ORG_PN=MPEG4_P2_SP_AAC"; 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)) //else if (string.Equals(extension, ".mpeg", StringComparison.OrdinalIgnoreCase))
//{ //{
// contentFeatures = "DLNA.ORG_PN=MPEG_PS_PAL"; // contentFeatures = "DLNA.ORG_PN=MPEG_PS_PAL";
@ -153,11 +157,7 @@ namespace MediaBrowser.Api.Playback.Progressive
// // ?? // // ??
// contentFeatures = "DLNA.ORG_PN=WMVHIGH_BASE"; // contentFeatures = "DLNA.ORG_PN=WMVHIGH_BASE";
//} //}
//else if (string.Equals(extension, ".mkv", StringComparison.OrdinalIgnoreCase))
//{
// // ??
// contentFeatures = "";
//}
if (!string.IsNullOrEmpty(contentFeatures)) if (!string.IsNullOrEmpty(contentFeatures))
{ {