From cf0a31a7bb52d633f43e298df95732392390544e Mon Sep 17 00:00:00 2001 From: cdrolle Date: Fri, 6 May 2016 03:10:03 -0700 Subject: [PATCH] Fixed an NPE with self-initializing DASH segments. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=121660680 --- .../google/android/exoplayer/extractor/DefaultTrackOutput.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/DefaultTrackOutput.java b/library/src/main/java/com/google/android/exoplayer/extractor/DefaultTrackOutput.java index e7dd3c80f7..471cf63e37 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/DefaultTrackOutput.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/DefaultTrackOutput.java @@ -24,6 +24,7 @@ import com.google.android.exoplayer.upstream.Allocation; import com.google.android.exoplayer.upstream.Allocator; import com.google.android.exoplayer.util.Assertions; import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer.util.Util; import java.io.EOFException; import java.io.IOException; @@ -742,7 +743,7 @@ public final class DefaultTrackOutput implements TrackOutput { public synchronized void format(Format format) { // We suppress changes between equal formats so we can use referential equality in readData. - if (!format.equals(upstreamFormat)) { + if (!Util.areEqual(format, upstreamFormat)) { upstreamFormat = format; } }