From 9092fad8e8ae6de7e7681181763fe96c8545d73a Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 17 Apr 2015 20:02:20 +0100
Subject: [PATCH] Fix subtitles.

---
 .../google/android/exoplayer/chunk/SingleSampleMediaChunk.java  | 2 +-
 .../com/google/android/exoplayer/text/TextTrackRenderer.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java b/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java
index 475abf7c62..9e7a2a84df 100644
--- a/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java
+++ b/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java
@@ -118,7 +118,7 @@ public final class SingleSampleMediaChunk extends BaseMediaChunk {
       if (headerData != null) {
         sampleSize += headerData.length;
       }
-      getOutput().sampleMetadata(startTimeUs, 0, sampleSize, 0, null);
+      getOutput().sampleMetadata(startTimeUs, C.SAMPLE_FLAG_SYNC, sampleSize, 0, null);
     } finally {
       dataSource.close();
     }
diff --git a/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java
index 52af1c9c45..60a3fe84c1 100644
--- a/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java
@@ -179,7 +179,7 @@ public class TextTrackRenderer extends TrackRenderer implements Callback {
         SampleHolder sampleHolder = parserHelper.getSampleHolder();
         sampleHolder.clearData();
         int result = source.readData(trackIndex, positionUs, formatHolder, sampleHolder, false);
-        if (result == SampleSource.SAMPLE_READ && !sampleHolder.isDecodeOnly()) {
+        if (result == SampleSource.SAMPLE_READ) {
           parserHelper.startParseOperation();
           textRendererNeedsUpdate = false;
         } else if (result == SampleSource.END_OF_STREAM) {