浏览代码

Merge pull request #5251 from crobibero/vpp-null-ref

Fix vpp null reference

(cherry picked from commit 467cd9227e63ed596f7d8b40b27efc4bf48eb02a)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
Bond-009 4 年之前
父节点
当前提交
557a091865
共有 1 个文件被更改,包括 6 次插入0 次删除
  1. 6 0
      MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

+ 6 - 0
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -131,6 +131,12 @@ namespace MediaBrowser.Controller.MediaEncoding
         private bool IsVppTonemappingSupported(EncodingJobInfo state, EncodingOptions options)
         {
             var videoStream = state.VideoStream;
+            if (videoStream == null)
+            {
+                // Remote stream doesn't have media info, disable vpp tonemapping.
+                return false;
+            }
+
             var codec = videoStream.Codec;
             if (string.Equals(options.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase))
             {