[vlc-commits] demux: adaptive: fix local file playback regression

Francois Cartegnie git at videolan.org
Sat Jul 9 18:42:44 CEST 2016


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jul  6 20:54:01 2016 +0200| [7961e49069723b96daf3f113877f7ed3df7c0db3] | committer: Francois Cartegnie

demux: adaptive: fix local file playback regression

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

 modules/demux/adaptive/http/ConnectionParams.cpp |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/http/ConnectionParams.cpp b/modules/demux/adaptive/http/ConnectionParams.cpp
index 98c21b7..1df660d 100644
--- a/modules/demux/adaptive/http/ConnectionParams.cpp
+++ b/modules/demux/adaptive/http/ConnectionParams.cpp
@@ -64,7 +64,14 @@ void ConnectionParams::setPath(const std::string &path_)
 
     std::ostringstream os;
     os.imbue(std::locale("C"));
-    os << scheme << "://" << hostname << ":" << port;
+    os << scheme << "://";
+    if(!hostname.empty())
+    {
+        os << hostname;
+        if( (port != 80 && scheme != "http") ||
+            (port != 443 && scheme != "https") )
+            os << ":" << port;
+    }
     os << path;
     uri = os.str();
 }



More information about the vlc-commits mailing list