From d4e35358a1737f5e5d7261735cdaf1b89e67c463 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Thu, 11 Sep 2014 16:09:52 +0100 Subject: [PATCH] Fix bad assertion. It doesn't hold for TTML subtitle chunks. --- .../java/com/google/android/exoplayer/chunk/Mp4MediaChunk.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/Mp4MediaChunk.java b/library/src/main/java/com/google/android/exoplayer/chunk/Mp4MediaChunk.java index 2793496b53..a4d05cacd7 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/Mp4MediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/Mp4MediaChunk.java @@ -96,7 +96,7 @@ public final class Mp4MediaChunk extends MediaChunk { prepared = true; } if (prepared) { - mediaFormat = Assertions.checkNotNull(extractor.getFormat()); + mediaFormat = extractor.getFormat(); psshInfo = extractor.getPsshInfo(); } }