resolve conflicts

5 years ago · c4ba71d96a
parent b4b93995f7
commit c4ba71d96a
1 changed files with 1 additions and 1 deletions
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@ -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();