CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-09-01 03:30:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fixes #1484 - (Feature request) Make emby choose output stream based on ffmpeg config

Browse source
This commit is contained in:
Luke Pulverenti 2016-04-30 15:16:43 -04:00
parent 04ba2d57ac
commit a15a762ba1
14 changed files with 105 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
View file

@ -582,7 +582,7 @@ namespace MediaBrowser.Server.Implementations.Sync
conversionOptions.ItemId = item.Id.ToString("N");
conversionOptions.MediaSources = _mediaSourceManager.GetStaticMediaSources(item, false, user).ToList();
var streamInfo = new StreamBuilder(_logger).BuildVideoItem(conversionOptions);
var streamInfo = new StreamBuilder(_mediaEncoder, _logger).BuildVideoItem(conversionOptions);
var mediaSource = streamInfo.MediaSource;
// No sense creating external subs if we're already burning one into the video
@ -786,7 +786,7 @@ namespace MediaBrowser.Server.Implementations.Sync
conversionOptions.ItemId = item.Id.ToString("N");
conversionOptions.MediaSources = _mediaSourceManager.GetStaticMediaSources(item, false, user).ToList();
var streamInfo = new StreamBuilder(_logger).BuildAudioItem(conversionOptions);
var streamInfo = new StreamBuilder(_mediaEncoder, _logger).BuildAudioItem(conversionOptions);
var mediaSource = streamInfo.MediaSource;
jobItem.MediaSourceId = streamInfo.MediaSourceId;