From e54d07c1b09ee051d4ceedcde12f50433111c45d Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 17 Mar 2015 12:36:46 +0000
Subject: [PATCH] Fix issue with new extractor input

---
 .../exoplayer/hls/parser/DataSourceExtractorInput.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/hls/parser/DataSourceExtractorInput.java b/library/src/main/java/com/google/android/exoplayer/hls/parser/DataSourceExtractorInput.java
index f951bea7a3..5e23f986e0 100644
--- a/library/src/main/java/com/google/android/exoplayer/hls/parser/DataSourceExtractorInput.java
+++ b/library/src/main/java/com/google/android/exoplayer/hls/parser/DataSourceExtractorInput.java
@@ -82,15 +82,15 @@ public final class DataSourceExtractorInput implements ExtractorInput {
       if (Thread.interrupted()) {
         throw new InterruptedException();
       }
-      int bytesRead = dataSource.read(SCRATCH_SPACE, 0, remaining);
+      int bytesRead = dataSource.read(SCRATCH_SPACE, 0, Math.min(SCRATCH_SPACE.length, remaining));
       if (bytesRead == -1) {
         isEnded = true;
-        return true;
+        return false;
       }
       remaining -= bytesRead;
     }
     position += length;
-    return false;
+    return true;
   }
 
   @Override