alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 14:28:46 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

restore missing file

Browse Source
This commit is contained in:
Luke Pulverenti
2017-04-22 15:32:24 -04:00
parent d7d5294ab5
commit 463b41354f
7 changed files with 59 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/Movies/BoxSet.cs
View File

@@ -205,7 +205,7 @@ namespace MediaBrowser.Controller.Entities.Movies
if (base.IsVisible(user))
{
return GetChildren(user, true).Any();
return base.GetChildren(user, true).Any();
}
return false;

6
MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
View File

@@ -16,7 +16,11 @@ namespace MediaBrowser.Controller.LiveTv
{
var list = base.GetUserDataKeys();
list.Insert(0, GetClientTypeName() + "-" + Name);
if (!ConfigurationManager.Configuration.DisableLiveTvChannelUserDataName)
{
list.Insert(0, GetClientTypeName() + "-" + Name);
}
return list;
}

2
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@@ -732,7 +732,7 @@ namespace MediaBrowser.Controller.MediaEncoding
if (string.Equals(videoEncoder, "libx264", StringComparison.OrdinalIgnoreCase))
{
param += " -x264opts:0 subme=0:rc_lookahead=10:me_range=4:me=dia:no_chroma_me:8x8dct=0:partitions=none";
param += " -x264opts:0 subme=0:me_range=4:rc_lookahead=10:me=dia:no_chroma_me:8x8dct=0:partitions=none";
}
if (!string.Equals(videoEncoder, "h264_omx", StringComparison.OrdinalIgnoreCase) &&