pull/702/head
Luke Pulverenti 9 years ago
parent 6270f4c912
commit fe7fd7cd26

@ -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)
{
bool requiresConversion = !StringHelper.EqualsIgnoreCase(subtitleStream.Codec, profile.Format);
if (!profile.SupportsLanguage(subtitleStream.Language))
{
continue;
@ -764,11 +763,6 @@ namespace MediaBrowser.Model.Dlna
if (profile.Method == SubtitleDeliveryMethod.Embed && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
{
if (!requiresConversion)
{
return profile;
}
return profile;
}
}

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

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

Loading…
Cancel
Save