diff --git a/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java b/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java index 908c8c66..b54d3d45 100644 --- a/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java +++ b/moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java @@ -179,9 +179,12 @@ public class VideoDepacketizer { avcFrameDataLength = 0; } - // Add the payload data to the chain - avcFrameDataChain.add(location); - avcFrameDataLength += location.length; + // FIXME: This check shouldn't be needed + if (avcFrameDataChain != null) { + // Add the payload data to the chain + avcFrameDataChain.add(location); + avcFrameDataLength += location.length; + } } public void addInputData(VideoPacket packet)