Thulinma
|
3a4784f1a9
|
Merge branch 'development' into LTS_development
|
2016-07-26 13:20:18 +02:00 |
|
Thulinma
|
6816b6074c
|
Fixed support for non-HTTP-compliant devices pulling HTTP TS output
|
2016-07-26 13:20:13 +02:00 |
|
Thulinma
|
cf75a2d6a2
|
Merge branch 'development' into LTS_development
|
2016-07-25 13:24:47 +02:00 |
|
Thulinma
|
bfa9882e8c
|
Added ISO639-2 decoding in JSON-formatted metadata output
|
2016-07-25 13:24:36 +02:00 |
|
Thulinma
|
16f293cf2c
|
Merge branch 'development' into LTS_development
|
2016-07-23 22:55:41 +02:00 |
|
Thulinma
|
4cef8d7cf5
|
Small fixes for VoD and DTSC pull input
|
2016-07-23 22:55:35 +02:00 |
|
Thulinma
|
10c45dad2a
|
Merge branch 'development' into LTS_development
|
2016-07-23 18:27:27 +02:00 |
|
Thulinma
|
6828a32db0
|
Tweak verbosity of wrong input order message.
|
2016-07-23 18:27:17 +02:00 |
|
Thulinma
|
b14b5f9bf5
|
Varioius stability and verbosity tweaks for DTSC, RTMP and in general
|
2016-07-23 13:13:34 +02:00 |
|
Thulinma
|
5076c89c6d
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
# src/output/output.cpp
|
2016-07-23 13:13:28 +02:00 |
|
Thulinma
|
b7c3d7dc44
|
Various stability and verbosity tweaks for DTSC, RTMP and in general
|
2016-07-23 13:11:25 +02:00 |
|
Thulinma
|
5f6abd291d
|
Tweaks to output drop behaviour
|
2016-07-22 14:30:40 +02:00 |
|
Thulinma
|
55528a014a
|
Added track drop message
|
2016-07-22 14:11:47 +02:00 |
|
Thulinma
|
cb5239ec01
|
Merge branch 'development' into LTS_development
|
2016-07-22 12:39:11 +02:00 |
|
Thulinma
|
4eb0a7c56c
|
Fix RTMP buffering
|
2016-07-22 12:39:07 +02:00 |
|
Thulinma
|
ab95786984
|
Fix RTMP buffering
|
2016-07-22 12:38:54 +02:00 |
|
Thulinma
|
a3595879b0
|
Merge branch 'development' into LTS_development
|
2016-07-22 11:25:45 +02:00 |
|
Thulinma
|
dd612a2643
|
RTMP fixes for streams > 5h in duration.
|
2016-07-22 11:25:38 +02:00 |
|
Erik Zandvliet
|
7d4fd24866
|
Resolved play/pause issue with JWPlayer
|
2016-07-22 11:24:16 +02:00 |
|
Thulinma
|
51d96175fe
|
RTMP fixes for streams > 5h in duration.
|
2016-07-22 11:23:53 +02:00 |
|
Erik Zandvliet
|
58ef8fcdd0
|
Resolved play/pause issue with JWPlayer
|
2016-07-22 11:01:56 +02:00 |
|
Erik Zandvliet
|
98438b680b
|
Renegotiation of extra tracks if a new header is sent in dtsc pull
|
2016-07-21 17:44:12 +02:00 |
|
Thulinma
|
0c16ae5a80
|
Added track-reselection to DTSC output
|
2016-07-21 17:39:20 +02:00 |
|
Thulinma
|
09b398f36c
|
Added list of viewers for all streams to balancer
|
2016-07-21 15:19:55 +02:00 |
|
Thulinma
|
f9dcbc7f13
|
Fixed balancer.
|
2016-07-21 14:46:29 +02:00 |
|
Thulinma
|
4e35165f3d
|
Tweaked load balancer verbosity levels
|
2016-07-21 14:37:29 +02:00 |
|
Thulinma
|
4edeb9f63f
|
Prevent FLV recordings from overwriting with empty files
|
2016-07-21 13:23:18 +02:00 |
|
Thulinma
|
13ff0e2904
|
Merge branch 'development' into LTS_development
|
2016-07-21 13:17:39 +02:00 |
|
Thulinma
|
d82f5e4b65
|
Minified.
|
2016-07-21 13:17:32 +02:00 |
|
Thulinma
|
d86899f6cc
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output_hls.cpp
# src/output/output_rtmp.cpp
# src/output/output_rtmp.h
|
2016-07-21 12:03:40 +02:00 |
|
Thulinma
|
70b66cd975
|
HLS segfault fix.
|
2016-07-21 11:59:17 +02:00 |
|
Thulinma
|
d7b1f05b51
|
Pro side of RTMP fixes
|
2016-07-21 11:50:24 +02:00 |
|
Thulinma
|
2f6cd40fb3
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output_rtmp.h
|
2016-07-21 11:41:03 +02:00 |
|
cat
|
b7c37ba60d
|
LSP/embed: fix for + in filenames in folder streams
|
2016-07-21 11:40:09 +02:00 |
|
Thulinma
|
e1fac6248e
|
Fix RTMP not shutting down on playback.
|
2016-07-21 11:39:31 +02:00 |
|
Thulinma
|
6694fedb3c
|
Merge branch 'development' into LTS_development
|
2016-07-21 10:15:34 +02:00 |
|
Thulinma
|
33a0b2fae3
|
Added URL encode for info_/embed_ stream URLs
|
2016-07-21 10:15:26 +02:00 |
|
Thulinma
|
1e3d4f6ee1
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output_rtmp.cpp
|
2016-07-21 00:01:47 +02:00 |
|
Thulinma
|
ec7f7f5bc4
|
Correctly initialize isPushing value for RTMP
|
2016-07-20 23:59:54 +02:00 |
|
Thulinma
|
9ff8be341c
|
Merge branch 'development' into LTS_development
|
2016-07-20 14:57:30 +02:00 |
|
Thulinma
|
a9dffb9438
|
Added check for invalid handle to config storage
|
2016-07-20 14:56:04 +02:00 |
|
Thulinma
|
b608f011e3
|
Load balancer fixes/improvements made during paper writing.
|
2016-07-20 11:07:46 +02:00 |
|
Thulinma
|
8219ac15ca
|
Merge branch 'development' into LTS_development
|
2016-07-19 14:20:45 +02:00 |
|
Thulinma
|
7c60f31c09
|
Added CORS headers to SRT and MP4 outputs
|
2016-07-19 14:19:01 +02:00 |
|
Thulinma
|
e0cc16cd86
|
Merge branch 'development' into LTS_development
|
2016-07-19 12:05:12 +02:00 |
|
Thulinma
|
d5fee4d656
|
Even more JSON/VTT/SRT fixes and internal URL handler improvements
|
2016-07-19 12:05:05 +02:00 |
|
Thulinma
|
49764e99fd
|
Merge branch 'development' into LTS_development
|
2016-07-19 10:27:49 +02:00 |
|
Thulinma
|
56dd4ac98c
|
More fixes to srt and vtt outputs
|
2016-07-19 10:27:29 +02:00 |
|
Thulinma
|
64746da63c
|
Merge branch 'development' into LTS_development
|
2016-07-19 10:05:04 +02:00 |
|
Thulinma
|
c78e695bad
|
Various small fixes to SRT and JSON outputs
|
2016-07-19 10:04:56 +02:00 |
|