CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-04 15:28:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Add GPL modules

Browse source
This commit is contained in:
Andrew Rabert 2018-12-27 18:27:57 -05:00
parent 9bac3ac616
commit a86b71899e
648 changed files with 50005 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View file

@ -727,11 +727,13 @@ namespace MediaBrowser.MediaEncoding.Encoder
var encodinghelper = new EncodingHelper(this, FileSystem, SubtitleEncoder());
if (videoStream != null)
{
/* fix
var decoder = encodinghelper.GetHardwareAcceleratedVideoDecoder(VideoType.VideoFile, videoStream, GetEncodingOptions());
if (!string.IsNullOrWhiteSpace(decoder))
{
args = decoder + " " + args;
}
*/
}
if (!string.IsNullOrWhiteSpace(container))
@ -847,11 +849,13 @@ namespace MediaBrowser.MediaEncoding.Encoder
var encodinghelper = new EncodingHelper(this, FileSystem, SubtitleEncoder());
if (videoStream != null)
{
/* fix
var decoder = encodinghelper.GetHardwareAcceleratedVideoDecoder(VideoType.VideoFile, videoStream, GetEncodingOptions());
if (!string.IsNullOrWhiteSpace(decoder))
{
args = decoder + " " + args;
}
*/
}
if (!string.IsNullOrWhiteSpace(container))
@ -1145,4 +1149,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
}
}
}
}