diff options
| author | Rich Lander <rlander@microsoft.com> | 2021-07-26 13:08:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 13:08:27 -0700 |
| commit | 3e0aab390aea4e934e60c4b60caee802cfe706d8 (patch) | |
| tree | a0d36f12a50724ac4531ac7af76058c996a5e3c7 /MediaBrowser.Model | |
| parent | 0ce7a15534461d70730ac8d1accfda1d45b01b55 (diff) | |
| parent | 85e705d09efbda1630b419fab3a0065046b8de6d (diff) | |
Merge branch 'master' into mediabrowser-controller-entities
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Properties/AssemblyInfo.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index 275b438f5..9653a8ece 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -469,7 +469,7 @@ namespace MediaBrowser.Model.Entities /// <value><c>true</c> if this instance is anamorphic; otherwise, <c>false</c>.</value> public bool? IsAnamorphic { get; set; } - private string GetResolutionText() + internal string GetResolutionText() { if (!Width.HasValue || !Height.HasValue) { diff --git a/MediaBrowser.Model/Properties/AssemblyInfo.cs b/MediaBrowser.Model/Properties/AssemblyInfo.cs index f99e9ece9..e50baf604 100644 --- a/MediaBrowser.Model/Properties/AssemblyInfo.cs +++ b/MediaBrowser.Model/Properties/AssemblyInfo.cs @@ -1,5 +1,6 @@ using System.Reflection; using System.Resources; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -14,6 +15,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: NeutralResourcesLanguage("en")] +[assembly: InternalsVisibleTo("Jellyfin.Model.Tests")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from |