hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	CMakeLists.txt
#	lib/dtsc.h
#	lib/dtscmeta.cpp
#	lib/mp4_generic.cpp
#	lib/mp4_ms.cpp
#	lib/procs.cpp
#	lib/socket.cpp
#	lib/stream.cpp
#	lib/stream.h
#	lib/ts_packet.cpp
#	src/analysers/dtsc_analyser.cpp
#	src/controller/controller.cpp
#	src/controller/controller_capabilities.cpp
#	src/controller/controller_statistics.cpp
#	src/controller/controller_storage.cpp
#	src/controller/controller_storage.h
#	src/controller/controller_streams.cpp
#	src/input/input.cpp
#	src/input/input.h
#	src/input/input_buffer.cpp
#	src/input/input_buffer.h
#	src/input/input_dtsc.cpp
#	src/io.cpp
#	src/io.h
#	src/output/mist_out.cpp
#	src/output/output.cpp
#	src/output/output_hls.cpp
#	src/output/output_hls.h
#	src/output/output_hss.h
#	src/output/output_http_internal.cpp
#	src/output/output_httpts.h
#	src/output/output_progressive_flv.cpp
#	src/output/output_progressive_mp3.cpp
#	src/output/output_raw.cpp
#	src/output/output_rtmp.cpp
#	src/output/output_rtmp.h
#	src/output/output_ts.cpp
This commit is contained in:
Thulinma 2016-06-02 14:50:22 +02:00
commit 9ecce58e3c
3 changed files with 172 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/embed.js
View file

@ -236,7 +236,7 @@ function mistembed(streamname) {
container = document.createElement('div'),
forceType = false,
forceSupportCheck = false,
autoplay = false,
autoplay = true,
urlappend = false;
if (me.parentNode.hasAttribute('data-forcetype')) {
@ -245,8 +245,8 @@ function mistembed(streamname) {
if (me.parentNode.hasAttribute('data-forcesupportcheck')) {
forceSupportCheck = true;
}
if (me.parentNode.hasAttribute('data-autoplay')) {
autoplay = true;
if (me.parentNode.hasAttribute('data-noautoplay')) {
autoplay = false;
}
if (me.parentNode.hasAttribute('data-urlappend')) {
urlappend = me.parentNode.getAttribute('data-urlappend');