mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
3.0.5666.5
This commit is contained in:
parent
6270f4c912
commit
fe7fd7cd26
3 changed files with 3 additions and 9 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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")]
|
||||||
|
|
Loading…
Reference in a new issue