Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix vpp null reference

(cherry picked from commit 467cd9227e63ed596f7d8b40b27efc4bf48eb02a)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Bond-009 2021-02-17 10:07:54 +01:00 committed by Joshua M. Boniface
parent a1773ce97b
commit 557a091865
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

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