Commit cf0a31a7 by cdrolle Committed by Oliver Woodman

Fixed an NPE with self-initializing DASH segments.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=121660680
parent 27132bb2
...@@ -24,6 +24,7 @@ import com.google.android.exoplayer.upstream.Allocation; ...@@ -24,6 +24,7 @@ import com.google.android.exoplayer.upstream.Allocation;
import com.google.android.exoplayer.upstream.Allocator; import com.google.android.exoplayer.upstream.Allocator;
import com.google.android.exoplayer.util.Assertions; import com.google.android.exoplayer.util.Assertions;
import com.google.android.exoplayer.util.ParsableByteArray; import com.google.android.exoplayer.util.ParsableByteArray;
import com.google.android.exoplayer.util.Util;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
...@@ -742,7 +743,7 @@ public final class DefaultTrackOutput implements TrackOutput { ...@@ -742,7 +743,7 @@ public final class DefaultTrackOutput implements TrackOutput {
public synchronized void format(Format format) { public synchronized void format(Format format) {
// We suppress changes between equal formats so we can use referential equality in readData. // 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; upstreamFormat = format;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment