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

resolve conflicts

Browse source
This commit is contained in:
nyanmisaka 2020-04-09 01:38:06 +08:00 • committed by Vasily
parent b4b93995f7
commit c4ba71d96a
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View file

@ -2019,7 +2019,7 @@ namespace MediaBrowser.Controller.MediaEncoding
}
// If we're hardware VAAPI decoding and software encoding, download frames from the decoder first
else if (IsVaapiSupported(state) && string.Equals(options.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase)
else if ((videoDecoder ?? string.Empty).IndexOf("vaapi", StringComparison.OrdinalIgnoreCase) != -1
&& string.Equals(outputVideoCodec, "libx264", StringComparison.OrdinalIgnoreCase))
{
var codec = videoStream.Codec.ToLowerInvariant();