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

Merge pull request #2694 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-06-08 14:39:37 -04:00 committed by GitHub
commit 9cb197d511
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.Providers/Omdb/OmdbImageProvider.cs
View File

@ -54,11 +54,23 @@ namespace MediaBrowser.Providers.Omdb
if (!string.IsNullOrEmpty(rootObject.Poster)) if (!string.IsNullOrEmpty(rootObject.Poster))
{ {
list.Add(new RemoteImageInfo if (item is Episode)
{ {
ProviderName = Name, // img.omdbapi.com returning 404's
Url = string.Format("https://img.omdbapi.com/?i={0}&apikey=82e83907", imdbId) list.Add(new RemoteImageInfo
}); {
ProviderName = Name,
Url = rootObject.Poster
});
}
else
{
list.Add(new RemoteImageInfo
{
ProviderName = Name,
Url = string.Format("https://img.omdbapi.com/?i={0}&apikey=82e83907", imdbId)
});
}
} }
} }

16
MediaBrowser.Server.Mono/ImageEncoderHelper.cs
View File

@ -23,14 +23,14 @@ namespace MediaBrowser.Server.Startup.Common
{ {
if (!startupOptions.ContainsOption("-enablegdi")) if (!startupOptions.ContainsOption("-enablegdi"))
{ {
//try try
//{ {
// return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem); return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem);
//} }
//catch catch
//{ {
// logger.Error("Error loading Skia. Will revert to ImageMagick."); logger.Error("Error loading Skia. Will revert to ImageMagick.");
//} }
try try
{ {

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.19.5")] [assembly: AssemblyVersion("3.2.19.6")]