From f69cc191ab046b8f8c786033f7b77ed5e0137e4b Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 21 Feb 2018 07:14:25 -0800 Subject: [PATCH] Drop EMSG atoms before MOOV ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=186454715 --- .../exoplayer2/extractor/mp4/FragmentedMp4Extractor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java index 9a70dfbf90..7e40f6d2ee 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java @@ -549,7 +549,7 @@ public final class FragmentedMp4Extractor implements Extractor { * Parses an emsg atom (defined in 23009-1). */ private void onEmsgLeafAtomRead(ParsableByteArray atom) { - if (emsgTrackOutputs.length == 0) { + if (emsgTrackOutputs == null || emsgTrackOutputs.length == 0) { return; }