Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta

This commit is contained in:
Luke Pulverenti 2016-08-27 14:34:32 -04:00
commit 73ede8c4a1
8 changed files with 48 additions and 4 deletions

View file

@ -213,6 +213,15 @@ namespace MediaBrowser.Dlna.Profiles
}
};
SubtitleProfiles = new[]
{
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed
}
};
ResponseProfiles = new ResponseProfile[] { };
}
}

View file

@ -213,6 +213,15 @@ namespace MediaBrowser.Dlna.Profiles
}
};
SubtitleProfiles = new[]
{
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed
}
};
ResponseProfiles = new ResponseProfile[] { };
}
}

View file

@ -201,6 +201,15 @@ namespace MediaBrowser.Dlna.Profiles
}
};
SubtitleProfiles = new[]
{
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed
}
};
ResponseProfiles = new ResponseProfile[] { };
}
}

View file

@ -201,6 +201,15 @@ namespace MediaBrowser.Dlna.Profiles
}
};
SubtitleProfiles = new[]
{
new SubtitleProfile
{
Format = "srt",
Method = SubtitleDeliveryMethod.Embed
}
};
ResponseProfiles = new ResponseProfile[] { };
}
}

View file

@ -81,5 +81,7 @@
</CodecProfile>
</CodecProfiles>
<ResponseProfiles />
<SubtitleProfiles />
<SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile>

View file

@ -81,5 +81,7 @@
</CodecProfile>
</CodecProfiles>
<ResponseProfiles />
<SubtitleProfiles />
<SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile>

View file

@ -79,5 +79,7 @@
</CodecProfile>
</CodecProfiles>
<ResponseProfiles />
<SubtitleProfiles />
<SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile>

View file

@ -79,5 +79,7 @@
</CodecProfile>
</CodecProfiles>
<ResponseProfiles />
<SubtitleProfiles />
<SubtitleProfiles>
<SubtitleProfile format="srt" method="Embed" />
</SubtitleProfiles>
</Profile>