Commit graph

3430 commits

Author SHA1 Message Date
Thulinma
40b7cb7e63 Merge branch 'development' into LTS_development 2017-05-01 11:53:56 +02:00
Thulinma
b4dc59d409 Define ACCESSPERMS in shared_memory.h if not defined 2017-05-01 11:53:38 +02:00
Thulinma
79b7ef3300 Lowered debug level of socket address comparisons 2017-05-01 11:53:31 +02:00
Thulinma
efc80123f0 Access log compile fixes 2017-04-18 19:33:40 +02:00
Thulinma
66ecd88130 Fixed FLV/RTMP/HDS A-law and Mu-law support 2017-04-18 12:38:41 +02:00
Thulinma
d158ba3213 Added PCM A-law support to RTSP, both input and output 2017-04-18 12:38:40 +02:00
Thulinma
b9f60ac92c Sessions are now wiped after the disconnect timeout, if denied access 2017-04-18 12:34:00 +02:00
Thulinma
9ddfa97148 Added automatic User-Agent stream tagging 2017-04-18 12:33:54 +02:00
Thulinma
d0912c9d00 Controller now listens locally to UDP port 4242 for API commands, added always-minimal api2 request type. 2017-04-18 12:33:49 +02:00
Thulinma
3980b8c8c1 Access logs + made prometheus runtime changeable 2017-04-18 12:33:06 +02:00
Thulinma
7629b00a4c Merge branch 'development' into LTS_development 2017-04-18 12:32:39 +02:00
Thulinma
a7718c78e9 Made JSON::string_escape a public function 2017-04-18 12:20:25 +02:00
Thulinma
a82be2775f Added local-only auto-authorize for API 2017-04-18 12:20:20 +02:00
Thulinma
5e2b29466b Fixes and improvements to generic push-input handling 2017-04-18 12:00:58 +02:00
Thulinma
29cc6c15f8 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_http_internal.cpp
2017-04-06 10:29:48 +02:00
Cat
7b1652498b when public address is configured in the http protocol, thats where player.js should be loaded from 2017-04-06 10:08:52 +02:00
Thulinma
aa0e09e45b Fixed timings for license system 2017-03-30 12:22:16 +02:00
Thulinma
ea4b0f8f45 Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_storage.cpp
#	src/controller/controller_storage.h
2017-03-29 12:06:35 +02:00
Thulinma
11f95a64fe Improved console interface 2017-03-29 12:05:42 +02:00
Thulinma
831e454ebb Improved console interface 2017-03-29 12:03:15 +02:00
Thulinma
d352c74ad0 Fixed 32-bit compile error 2017-03-20 18:25:40 +01:00
Thulinma
1c081cc6a9 Merge branch 'development' into LTS_development 2017-03-20 16:59:34 +01:00
Cat
2454e03bcf LSP: fail gracefully when a pointer is undefined 2017-03-20 15:56:22 +01:00
Thulinma
7617158ece Merge branch 'development' into LTS_development 2017-03-17 14:18:50 +01:00
Cat
357182d244 LSP: handle an empty streaminfo object 2017-03-17 14:12:28 +01:00
Cat
64219a62f1 added autoreload for offline streams 2017-03-17 14:12:28 +01:00
Thulinma
042f998bd9 Merge branch 'development' into LTS_development 2017-03-17 14:10:58 +01:00
Thulinma
67feb20741 Fixed forking bug 2017-03-17 14:07:55 +01:00
Thulinma
c7034fee86 Merge branch 'development' into LTS_development
# Conflicts:
#	src/io.cpp
#	src/io.h
#	src/output/output.cpp
#	src/output/output.h
#	src/output/output_rtmp.cpp
#	src/output/output_rtmp.h
2017-03-16 17:20:12 +01:00
Thulinma
746d982d28 bufferLivePacket improvements for generic Outputs 2017-03-16 17:15:50 +01:00
Thulinma
eef9303e61 bufferLivePacket improvements for generic Outputs 2017-03-16 17:12:54 +01:00
Thulinma
bd2f1724f6 Removed warning for nonselected tracks if no tracks *can* be selected 2017-03-16 11:33:06 +01:00
Thulinma
2717c21d4e Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_progressive_mp4.cpp
2017-03-16 11:16:08 +01:00
Thulinma
43e82f8c87 Fix for Windows semaphore problem in live streams 2017-03-16 11:14:59 +01:00
Cat
b6486878ca Embed: - fixed timer issue causing player to reload after an unload
- added version numbering
2017-03-16 11:14:32 +01:00
Thulinma
27b85e76d3 Removed deprecated MistMultiplex header 2017-03-16 11:14:03 +01:00
Thulinma
c3e6c03c45 Merge branch 'development' into LTS_development 2017-03-16 10:26:40 +01:00
Thulinma
e3c01be431 Add cache control headers. 2017-03-16 10:26:07 +01:00
Thulinma
8a31176041 Merge branch 'development' into LTS_development 2017-03-13 14:49:39 +01:00
Thulinma
b9dab56607 Fixes to MP3 input seeking 2017-03-13 14:49:31 +01:00
Thulinma
a2bce4bc11 Merge branch 'development' into LTS_development 2017-03-13 14:21:20 +01:00
Thulinma
4fc60b06aa Cross compiling is hell. 2017-03-13 14:18:45 +01:00
Thulinma
b2c6d434d6 Merge branch 'development' into LTS_development 2017-03-10 11:48:39 +01:00
Cat
b053947bfa LSP: triggers added params and LIVE_BANDWIDTH 2017-03-10 11:47:50 +01:00
Thulinma
a542938927 Added support for setting MP4 rate through HTTP request header X-Mist-Rate 2017-03-10 11:42:36 +01:00
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