[vlc-commits] demux: adaptive: use stream url instead of demux location

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Aug 15 16:49:52 2016 +0200| [18b0abd503b9e3f22c42a9e2acfa360d8bbdb9d9] | committer: Francois Cartegnie

demux: adaptive: use stream url instead of demux location

refs #17142
fixes handling redirection of master playlist

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=18b0abd503b9e3f22c42a9e2acfa360d8bbdb9d9
---

 modules/demux/adaptive/adaptive.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/demux/adaptive/adaptive.cpp b/modules/demux/adaptive/adaptive.cpp
index bfc45e1..c6e34e7 100644
--- a/modules/demux/adaptive/adaptive.cpp
+++ b/modules/demux/adaptive/adaptive.cpp
@@ -129,9 +129,7 @@ static int Open(vlc_object_t *p_obj)
     AbstractAdaptationLogic::LogicType logic =
             static_cast<AbstractAdaptationLogic::LogicType>(var_InheritInteger(p_obj, "adaptive-logic"));
 
-    std::string playlisturl(p_demux->psz_access);
-    playlisturl.append("://");
-    playlisturl.append(p_demux->psz_location);
+    std::string playlisturl(p_demux->s->psz_url);
 
     bool dashmime = DASHManager::mimeMatched(mimeType);
     bool smoothmime = SmoothManager::mimeMatched(mimeType);