aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2021-02-17 10:07:54 +0100
committerGitHub <noreply@github.com>2021-02-17 10:07:54 +0100
commit467cd9227e63ed596f7d8b40b27efc4bf48eb02a (patch)
treeade2f9318b7a5eeb2bf83051e8f603d3e1431e0a
parentb4c2086138cf51be0df6c116533de78ed08fc7d2 (diff)
parent0cce843f07919deb8a6e4fe15ff5c5cb46089f11 (diff)
Merge pull request #5251 from crobibero/vpp-null-ref
Fix vpp null reference
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 3b7ae4c32..fa9222023 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/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))
{