diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java b/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java index 06af95e56c..dd542c8616 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java @@ -163,7 +163,8 @@ public class ContainerMediaChunk extends BaseMediaChunk implements SingleTrackOu // Private methods. private static MediaFormat getAdjustedMediaFormat(MediaFormat format, long sampleOffsetUs) { - if (sampleOffsetUs != 0 && format.subsampleOffsetUs != MediaFormat.OFFSET_SAMPLE_RELATIVE) { + if (sampleOffsetUs != 0 && format != null + && format.subsampleOffsetUs != MediaFormat.OFFSET_SAMPLE_RELATIVE) { return format.copyWithSubsampleOffsetUs(format.subsampleOffsetUs + sampleOffsetUs); } return format;