diff options
| author | nyanmisaka <nst799610810@gmail.com> | 2020-04-09 01:38:06 +0800 |
|---|---|---|
| committer | Vasily <just.one.man@yandex.ru> | 2020-05-26 18:13:20 +0300 |
| commit | c4ba71d96a4f8651a65b901861bf0f2c053f5f50 (patch) | |
| tree | 8cb3da0a011def028a05f683a719e4d16413b58c /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | b4b93995f7f05971bd8532cadc9b80db07de9ab3 (diff) | |
resolve conflicts
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 807ba4e93..1a12ff721 100644 --- 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(); |