mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
fix stream building error
This commit is contained in:
parent
89258ad871
commit
e7277f4350
@ -605,6 +605,11 @@ namespace MediaBrowser.Model.Dlna
|
||||
|
||||
private StreamInfo BuildVideoItem(MediaSourceInfo item, VideoOptions options)
|
||||
{
|
||||
if (item == null)
|
||||
{
|
||||
throw new ArgumentNullException("item");
|
||||
}
|
||||
|
||||
List<TranscodeReason> transcodeReasons = new List<TranscodeReason>();
|
||||
|
||||
StreamInfo playlistItem = new StreamInfo
|
||||
@ -993,7 +998,12 @@ namespace MediaBrowser.Model.Dlna
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -30,7 +30,6 @@ using Emby.Server.Implementations;
|
||||
using Emby.Server.Implementations.Browser;
|
||||
using Emby.Server.Implementations.IO;
|
||||
using Emby.Server.Implementations.Logging;
|
||||
using ImageMagickSharp;
|
||||
using MediaBrowser.Common.Net;
|
||||
using MediaBrowser.Model.IO;
|
||||
|
||||
@ -72,8 +71,6 @@ namespace MediaBrowser.ServerApplication
|
||||
ApplicationPath = currentProcess.MainModule.FileName;
|
||||
var architecturePath = Path.Combine(Path.GetDirectoryName(ApplicationPath), Environment.Is64BitProcess ? "x64" : "x86");
|
||||
|
||||
Wand.SetMagickCoderModulePath(architecturePath);
|
||||
|
||||
var success = SetDllDirectory(architecturePath);
|
||||
|
||||
SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_sqlite3());
|
||||
|
Loading…
Reference in New Issue
Block a user