Merge branch '2.0release' into develop

10 years ago · 2f66c8dd09
parent 829b3a392b 93a1d097dc
commit 2f66c8dd09
1 changed files with 3 additions and 0 deletions
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@ -123,6 +123,9 @@ function build_default_hls_url() {
        port = 8080;
    }
    
+    if (stream.indexOf(".flv") >= 0) {
+        return "http://" + server + ":" + port + "/" + app + "/" + stream;
+    }
    return "http://" + server + ":" + port + "/" + app + "/" + stream + ".m3u8";
 }