From 050b0b66da1ab9da5b01ac332451e88d06eba499 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 24 Mar 2016 08:54:24 -0700
Subject: [PATCH] Fix starting playback from t!=0 ------------- Created by MOE:
 https://github.com/google/moe MOE_MIGRATED_REVID=118032818

---
 .../android/exoplayer/extractor/ExtractorSampleSource.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java b/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
index e2cc007cfb..6d201b3d67 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
@@ -416,7 +416,7 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
         clearState();
         allocator.trim(0);
       }
-    } else if (!isFirstTrackSelection && newTracksSelected) {
+    } else if (isFirstTrackSelection ? positionUs != 0 : newTracksSelected) {
       seekToInternal(positionUs);
     }
   }