Merge branch 'dev-v2' of persistent-https://github.com/google/ExoPlayer into dev-v2

b7d118fd · Oliver Woodman · d422d2e6 · fefef0f9 · b7d118fd
Commit b7d118fd authored Dec 14, 2016 by Oliver Woodman
Showing with 1 additions and 3 deletions
library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java
--- a/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java
+++ b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java
@@ -786,9 +786,7 @@ public final class DefaultTrackOutput implements TrackOutput {
        return C.POSITION_UNSET;
      }
-      int lastWriteIndex = (relativeWriteIndex == 0 ? capacity : relativeWriteIndex) - 1;
+      if (timeUs > largestQueuedTimestampUs) {
-      long lastTimeUs = timesUs[lastWriteIndex];
-      if (timeUs > lastTimeUs) {
        return C.POSITION_UNSET;
      }