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

Merge pull request #2741 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-07-01 14:01:24 -04:00 committed by GitHub
commit a382c6363f
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -605,6 +605,11 @@ namespace MediaBrowser.Model.Dlna
private StreamInfo BuildVideoItem(MediaSourceInfo item, VideoOptions options) private StreamInfo BuildVideoItem(MediaSourceInfo item, VideoOptions options)
{ {
if (item == null)
{
throw new ArgumentNullException("item");
}
List<TranscodeReason> transcodeReasons = new List<TranscodeReason>(); List<TranscodeReason> transcodeReasons = new List<TranscodeReason>();
StreamInfo playlistItem = new StreamInfo StreamInfo playlistItem = new StreamInfo
@ -993,7 +998,12 @@ namespace MediaBrowser.Model.Dlna
{ {
LogConditionFailure(profile, "VideoContainerProfile", i, mediaSource); LogConditionFailure(profile, "VideoContainerProfile", i, mediaSource);
return null; var transcodeReason = GetTranscodeReasonForFailedCondition(i);
var transcodeReasons = transcodeReason.HasValue
? new List<TranscodeReason> { transcodeReason.Value }
: new List<TranscodeReason> { };
return new Tuple<PlayMethod?, List<TranscodeReason>>(null, transcodeReasons);
} }
} }

3
MediaBrowser.ServerApplication/MainStartup.cs
View File

@ -30,7 +30,6 @@ using Emby.Server.Implementations;
using Emby.Server.Implementations.Browser; using Emby.Server.Implementations.Browser;
using Emby.Server.Implementations.IO; using Emby.Server.Implementations.IO;
using Emby.Server.Implementations.Logging; using Emby.Server.Implementations.Logging;
using ImageMagickSharp;
using MediaBrowser.Common.Net; using MediaBrowser.Common.Net;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
@ -72,8 +71,6 @@ namespace MediaBrowser.ServerApplication
ApplicationPath = currentProcess.MainModule.FileName; ApplicationPath = currentProcess.MainModule.FileName;
var architecturePath = Path.Combine(Path.GetDirectoryName(ApplicationPath), Environment.Is64BitProcess ? "x64" : "x86"); var architecturePath = Path.Combine(Path.GetDirectoryName(ApplicationPath), Environment.Is64BitProcess ? "x64" : "x86");
Wand.SetMagickCoderModulePath(architecturePath);
var success = SetDllDirectory(architecturePath); var success = SetDllDirectory(architecturePath);
SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3()); SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3());

4
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@ -73,10 +73,6 @@
<Reference Include="Emby.Server.Sync"> <Reference Include="Emby.Server.Sync">
<HintPath>..\ThirdParty\emby\Emby.Server.Sync.dll</HintPath> <HintPath>..\ThirdParty\emby\Emby.Server.Sync.dll</HintPath>
</Reference> </Reference>
<Reference Include="ImageMagickSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ImageMagickSharp.1.0.0.18\lib\net45\ImageMagickSharp.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL"> <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.4.11\lib\net45\NLog.dll</HintPath> <HintPath>..\packages\NLog.4.4.11\lib\net45\NLog.dll</HintPath>
<Private>True</Private> <Private>True</Private>

1
MediaBrowser.ServerApplication/packages.config
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="ImageMagickSharp" version="1.0.0.18" targetFramework="net45" />
<package id="NLog" version="4.4.11" targetFramework="net462" /> <package id="NLog" version="4.4.11" targetFramework="net462" />
<package id="ServiceStack.Text" version="4.5.8" targetFramework="net462" /> <package id="ServiceStack.Text" version="4.5.8" targetFramework="net462" />
<package id="SharpCompress" version="0.14.0" targetFramework="net462" /> <package id="SharpCompress" version="0.14.0" targetFramework="net462" />

2
SharedVersion.cs
View File

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