From 01151c9c65810a9fff439f5901a85bde4e6a4f63 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 8 Dec 2014 20:10:52 +0000
Subject: [PATCH] Don't append base uri if chunkUrl is absolute.

---
 .../exoplayer/smoothstreaming/SmoothStreamingManifest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java
index 271949b58b..7a6a32e44a 100644
--- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java
+++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java
@@ -274,7 +274,7 @@ public class SmoothStreamingManifest {
       String chunkUrl = chunkTemplate
           .replace(URL_PLACEHOLDER_BITRATE, Integer.toString(tracks[track].bitrate))
           .replace(URL_PLACEHOLDER_START_TIME, Long.toString(chunkStartTimes.get(chunkIndex)));
-      return baseUri.buildUpon().appendEncodedPath(chunkUrl).build();
+      return Util.getMergedUri(baseUri, chunkUrl);
     }
 
   }