From f69f94899185bbfd805dc82ff79bc710570e11b7 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 1 Sep 2015 13:52:30 +0100
Subject: [PATCH] Fixed issue in which ContainerMediaChunk would throw an NPE
 for self-initializing chunks.

---
 .../google/android/exoplayer/chunk/ContainerMediaChunk.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;