Merge branch '4.0release' into merge/develop

pull/2943/head
winlin 3 years ago
commit 196df0bbb9

@ -295,8 +295,9 @@
}); });
$("#btn_start").click(startDemo); $("#btn_start").click(startDemo);
// Never play util windows loaded @see https://github.com/ossrs/srs/issues/2732
if (conf.autostart) { if (conf.autostart) {
startDemo(); window.addEventListener("load", function(){ startDemo(); });
} }
}); });
</script> </script>

@ -199,8 +199,9 @@
}); });
$("#btn_start").click(startDemo); $("#btn_start").click(startDemo);
// Never play util windows loaded @see https://github.com/ossrs/srs/issues/2732
if (conf.autostart) { if (conf.autostart) {
startDemo(); window.addEventListener("load", function(){ startDemo(); });
} }
}); });
</script> </script>

@ -110,12 +110,12 @@ $(function(){
srs_init_rtc("#txt_url", query); srs_init_rtc("#txt_url", query);
$("#btn_publish").click(startPublish); $("#btn_publish").click(startPublish);
// Never play util windows loaded @see https://github.com/ossrs/srs/issues/2732
if (query.autostart === 'true') { if (query.autostart === 'true') {
startPublish(); window.addEventListener("load", function(){ startPublish(); });
} }
}); });
</script> </script>
</body> </body>
</html> </html>
</html>

Loading…
Cancel
Save