Commit graph

3435 commits

Author SHA1 Message Date
Thulinma
cab87a6425 Updated triggers, implemented LIVE_BANDWIDTH trigger 2017-03-10 11:41:52 +01:00
Thulinma
6a68d86a0e Licensing fixes for long updating intervals 2017-03-10 11:41:00 +01:00
Thulinma
5000afe768 Added --public-address option to HTTP output, for address overwriting 2017-03-10 11:39:31 +01:00
Thulinma
543ae0882b Added NOSSL flag 2017-03-10 11:39:04 +01:00
Thulinma
c58f11fb22 License system enabled. 2017-03-09 16:20:48 +01:00
Thulinma
4762f1c8e9 Merge branch 'development' into LTS_development 2017-03-07 18:03:37 +01:00
Thulinma
714a11eebd Fixed older cmake versions... while breaking cross-platform compatibility :-( 2017-03-07 18:03:27 +01:00
Thulinma
8b62c1c664 Merge branch 'development' into LTS_development 2017-03-07 17:07:05 +01:00
Thulinma
907d48b7e5 Fix CMake problem with headers, fixed sourcery cross compile detection 2017-03-07 17:05:24 +01:00
Thulinma
0ea100758d Added FLV::seekToTagType function for fast FLV seeking, now used in MistInFLV 2017-03-07 17:05:24 +01:00
Thulinma
25ddaa3595 Merge branch 'development' into LTS_development 2017-03-06 11:53:52 +01:00
Thulinma
bea605fd18 Updated minified.js file 2017-03-06 11:52:55 +01:00
Cat
cf942c5700 changed event forward method 2017-03-06 11:52:14 +01:00
Cat
899ee1088a various embed tweaks 2017-03-06 11:52:05 +01:00
Cat
dc6d0643bb embed: partial rewrite 2017-03-06 11:52:00 +01:00
Cat
f5da3614fe Embed: quadratic volume and reload button timeout 2017-03-06 11:51:55 +01:00
Cat
4fd6d14744 Embed: support without localStorage 2017-03-06 11:51:50 +01:00
Cat
aa3527dcb0 Embed: custom streaminfo 2017-03-06 11:51:32 +01:00
Cat
4b1608646d remove all option for checklist 2017-03-06 11:51:26 +01:00
Cat
a41929168d Embed: dont attempt to loop live videos 2017-03-06 11:47:09 +01:00
Cat
17c1368235 Embed: clear target element before appending player 2017-03-06 11:47:04 +01:00
Cat
b0326ccd1e LSP: thumbnailing; currently disabled 2017-03-06 11:46:44 +01:00
Thulinma
f1424b0836 Merge branch 'development' into LTS_development 2017-03-06 10:01:49 +01:00
Thulinma
db543cb4e4 Fixed sourcery compiling 2017-03-06 10:01:42 +01:00
Thulinma
4a2fe53693 Merge branch 'development' into LTS_development 2017-03-02 17:30:17 +01:00
Thulinma
ac55b24e75 Fixed iOS/Apple MP4 support 2017-03-02 17:29:57 +01:00
Thulinma
990150aaba Fixed sourcery bug when wrong argument count given 2017-03-02 17:29:51 +01:00
Thulinma
a86cddc70a Added support for H264 SPS/PPS updates from RTP data in RTSP input 2017-02-28 17:31:44 +01:00
Thulinma
faa696c6d1 Added H264 analyser (most code by Erik Zandvliet) 2017-02-28 17:31:28 +01:00
Thulinma
bf1949f5ab Merge branch 'development' into LTS_development 2017-02-28 17:31:17 +01:00
Thulinma
4b2392ee4b Added missing pragma header in bitfields.h 2017-02-28 17:30:22 +01:00
Thulinma
ef3f4aaf1a Unified all push-in-enabled outputs into a single style/function of accepting incoming pushes 2017-02-28 14:08:08 +01:00
Thulinma
daa0833970 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.h
#	src/output/output_rtmp.cpp
2017-02-28 14:07:18 +01:00
Thulinma
9a783a782d Unified all push-in-enabled outputs into a single style/function of accepting incoming pushes 2017-02-28 14:05:37 +01:00
Thulinma
88749d2259 Added sourceURI to stream metadata structures 2017-02-28 13:59:38 +01:00
Thulinma
ec240fb1af Unified all input types into a single flexible type 2017-02-28 13:58:20 +01:00
Thulinma
e352a2fc38 Merge branch 'development' into LTS_development 2017-02-28 13:58:09 +01:00
Thulinma
8866b299fb Unified all input types into a single flexible type 2017-02-28 13:57:59 +01:00
Erik Zandvliet
5e29ff5bb6 Merge branch 'development' into LTS_development 2017-02-22 14:02:24 +01:00
Erik Zandvliet
56a85cdab5 Minor fixes for MP4 VoD assets > 4GB 2017-02-22 13:59:39 +01:00
Thulinma
640a1ec575 RTSP now counts UDP bytes in/out on the main TCP connection 2017-02-02 11:31:06 +01:00
Thulinma
7b1ef6c76e Fixed RTSP input not counting as input, fixed UDP-style input disconnect bug
# Conflicts:
#	src/output/output.h
2017-02-02 11:31:00 +01:00
Thulinma
28106cf396 Merge branch 'development' into LTS_development 2017-02-02 11:30:05 +01:00
Thulinma
23f0c388b5 Added ability for sockets to override their byte counters 2017-02-02 11:29:53 +01:00
Thulinma
6f08fcd371 Removed virtual keyword from RTMP getStatsName function 2017-02-02 11:29:45 +01:00
Thulinma
7ce1b0fdaf Removed no-longer-used source-check in output class 2017-02-02 11:29:27 +01:00
Thulinma
8f96245d40 Added unicode character support (UTF-8 <-> UTF-16 conversion) to JSON library 2017-02-02 11:29:19 +01:00
Thulinma
8756680d2e Merge branch 'development' into LTS_development
# Conflicts:
#	src/io.cpp
2017-01-31 15:42:14 +01:00
Thulinma
29f5d200cb Removed breaking Cygwin-specific code 2017-01-31 15:41:19 +01:00
Thulinma
f48b2f2877 Added live syncing code to RTSP output 2017-01-31 15:04:08 +01:00