diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-02-17 10:07:54 +0100 |
|---|---|---|
| committer | Joshua M. Boniface <joshua@boniface.me> | 2021-02-21 13:30:32 -0500 |
| commit | 557a09186562e20cb9a6cc3dc696663416a0c612 (patch) | |
| tree | 7b908ebefb4fcb848cbb965119bf69838c31d96b /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | a1773ce97bc507ee6372d96519d5993cd8c52636 (diff) | |
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>
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 6 |
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)) { |