diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java b/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java
index d7203f759c..75bcf72b88 100644
--- a/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java
+++ b/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java
@@ -59,10 +59,10 @@ public class DataSourceInputStream extends InputStream {
   @Override
   public int read() throws IOException {
     int length = read(singleByteArray);
-    if(length != -1) {
-      return singleByteArray[0] & 0xFF;
+    if (length == -1) {
+      return -1;
     }
-    return length;
+    return singleByteArray[0] & 0xFF;
   }
 
   @Override