michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

3.0.5666.5

Browse Source
This commit is contained in:
Luke Pulverenti 2015-07-10 22:23:28 -04:00
parent 6270f4c912
commit fe7fd7cd26
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -753,10 +753,9 @@ namespace MediaBrowser.Model.Dlna
} }
} }
// Look for supported embedded subs that we can just mux into the output
foreach (SubtitleProfile profile in subtitleProfiles) foreach (SubtitleProfile profile in subtitleProfiles)
{ {
bool requiresConversion = !StringHelper.EqualsIgnoreCase(subtitleStream.Codec, profile.Format);
if (!profile.SupportsLanguage(subtitleStream.Language)) if (!profile.SupportsLanguage(subtitleStream.Language))
{ {
continue; continue;
@ -764,11 +763,6 @@ namespace MediaBrowser.Model.Dlna
if (profile.Method == SubtitleDeliveryMethod.Embed && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format)) if (profile.Method == SubtitleDeliveryMethod.Embed && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
{ {
if (!requiresConversion)
{
return profile;
}
return profile; return profile;
} }
} }

2
MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
View File

@ -205,7 +205,7 @@ namespace MediaBrowser.Server.Implementations.Photos
if (item is UserView) if (item is UserView)
{ {
return HasChanged(item, ImageType.Primary) || HasChanged(item, ImageType.Thumb); return HasChanged(item, ImageType.Primary);
} }
var items = GetItemsWithImages(item).Result; var items = GetItemsWithImages(item).Result;

2
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5666.4")] [assembly: AssemblyVersion("3.0.5666.5")]