Thulinma
|
6a5549444b
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
# src/output/output_ts_base.cpp
|
2018-11-01 16:37:03 +01:00 |
|
Thulinma
|
425e98c6fd
|
Fixed TS-output (=HLS) related SIGABRT problem
|
2018-11-01 16:32:11 +01:00 |
|
Thulinma
|
24006648f9
|
Cleaned up, fixed and robustified semaphore and signal related code
|
2018-11-01 16:11:47 +01:00 |
|
Thulinma
|
78101d8c91
|
Merge branch 'development' into LTS_development
|
2018-10-30 14:59:37 +01:00 |
|
Thulinma
|
ee9b076b76
|
Limit how long startInput() will wait for an input to finish booting or shutting down
|
2018-10-30 14:59:32 +01:00 |
|
Thulinma
|
4be1daa60c
|
Fixed TS-output (=HLS) related SIGABRT problem
|
2018-10-30 14:59:18 +01:00 |
|
Thulinma
|
9c0494c04c
|
Changed not-acceptable RTMP requests from FAIL to INFO level.
|
2018-10-30 14:58:53 +01:00 |
|
Thulinma
|
03c64340c3
|
Fixed RTSP mplayer support
|
2018-10-16 11:11:23 +02:00 |
|
Thulinma
|
8034578fad
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/controller/controller_statistics.cpp
# src/controller/controller_statistics.h
# src/output/output.h
# src/output/output_hls.cpp
# src/output/output_http.cpp
|
2018-10-15 14:18:23 +02:00 |
|
Thulinma
|
b2995ea2db
|
Fix statistics in Free edition
|
2018-10-15 13:43:51 +02:00 |
|
Thulinma
|
cdaf7920b0
|
Merge branch 'development' into LTS_development
|
2018-10-15 11:19:32 +02:00 |
|
Thulinma
|
e5bb5faacb
|
Updated GeoIP from freegeoip to use ipstack API instead
|
2018-10-15 11:19:30 +02:00 |
|
Thulinma
|
dff150419b
|
Prevent statistics going negative when going through server restarts
|
2018-10-15 11:19:10 +02:00 |
|
Thulinma
|
ce1eef0885
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input.cpp
# src/input/input_buffer.cpp
# src/output/output.cpp
# src/output/output_progressive_mp4.cpp
# src/output/output_rtmp.cpp
|
2018-10-15 10:53:03 +02:00 |
|
Thulinma
|
776cfe1850
|
Backported various Pro edition changes and general code to Free edition
|
2018-10-15 10:25:43 +02:00 |
|
Thulinma
|
57e40fe921
|
Merge branch 'development' into LTS_development
|
2018-10-11 15:15:40 +02:00 |
|
Thulinma
|
2aa86ccf01
|
Fix memory leak in live inputs
|
2018-10-11 15:15:18 +02:00 |
|
Thulinma
|
ae4436216c
|
Make RTMP acceptable connection types a dropdown in the GUI
|
2018-10-10 15:11:07 +02:00 |
|
Thulinma
|
a0b011325c
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output_ebml.cpp
|
2018-10-10 15:06:09 +02:00 |
|
Thulinma
|
8afad6d574
|
Added DTS audio support to EBML input/output
|
2018-10-10 15:05:36 +02:00 |
|
Thulinma
|
ab39cca5f4
|
Fixed EBML input cutting off zero bytes in places where it's not appropriate
|
2018-10-10 15:04:37 +02:00 |
|
Thulinma
|
a53fd5fa63
|
EBML fix for non-static GOP sizes
|
2018-10-10 15:04:32 +02:00 |
|
Thulinma
|
6fc18ffea3
|
Merge branch 'development' into LTS_development
|
2018-10-08 11:27:25 +02:00 |
|
Thulinma
|
3a3498f17c
|
Added nicer error message handler in RTMP output connector
|
2018-10-08 11:26:49 +02:00 |
|
Thulinma
|
d7c36a0800
|
Merge branch 'development' into LTS_development
|
2018-10-07 17:01:11 +02:00 |
|
Thulinma
|
1b137ad3c3
|
Fixed all-interface IPv6 sockets being created when attempting to listen on a non-IPv6 interface address
|
2018-10-07 17:01:06 +02:00 |
|
Thulinma
|
c475fc3a1e
|
Added acceptable connection types RTMP option, able to reject either all incoming or outgoing streams on a particular interface.
|
2018-10-07 16:06:24 +02:00 |
|
Thulinma
|
b35d56cd8f
|
Added ability to override internal UDP API bound host/port
|
2018-10-07 16:06:20 +02:00 |
|
Thulinma
|
28db254d7b
|
Merge branch 'development' into LTS_development
|
2018-10-03 23:55:58 +02:00 |
|
Thulinma
|
14fa673df6
|
Switched extended RTMP timestamps from big endian to little endian, to match most current-day implementations.
|
2018-10-03 23:55:48 +02:00 |
|
Thulinma
|
cf101262db
|
Fixed audio/data rate calculation in Flash-based outputs
|
2018-10-03 23:55:43 +02:00 |
|
Thulinma
|
9d702dbc78
|
Merge branch 'development' into LTS_development
|
2018-10-03 11:00:09 +02:00 |
|
Thulinma
|
c9dc42ff18
|
Fixed support for gstreamer matroska streams
|
2018-10-03 10:59:50 +02:00 |
|
Thulinma
|
ecdcb977b1
|
Updated sourcery to avoid trigraphs
|
2018-10-03 10:59:40 +02:00 |
|
Thulinma
|
e2d8321760
|
Added JSON testing application
|
2018-10-02 13:53:28 +02:00 |
|
Thulinma
|
aee6420943
|
Merge branch 'development' into LTS_development
|
2018-10-02 13:48:32 +02:00 |
|
Thulinma
|
cefc8dc88d
|
Fixed CMakeLists header for MistOutHTTP
|
2018-10-02 13:48:23 +02:00 |
|
Thulinma
|
a74c9682c9
|
JSON lib fixes
|
2018-10-02 13:45:07 +02:00 |
|
Thulinma
|
4d9f11fd8b
|
Fix RTSP input
|
2018-09-08 16:16:00 +02:00 |
|
Thulinma
|
1d4980dca1
|
Merge branch 'development' into LTS_development
|
2018-09-08 16:15:55 +02:00 |
|
Thulinma
|
c17064c305
|
Re-order userClient init for stream-type inputs.
|
2018-09-08 16:15:47 +02:00 |
|
Thulinma
|
6226a05fe3
|
Fix incorrect sending of HTTP error response through Websocket connections.
|
2018-09-08 16:15:12 +02:00 |
|
Erik Zandvliet
|
493e5bebfa
|
AVCCBox.multiplyPPS(), allow for multiple SPS/PPS in AVCC Box
|
2018-08-30 18:59:03 +02:00 |
|
Thulinma
|
b8c932ad1c
|
Merge branch 'development' into LTS_development
|
2018-08-30 18:33:44 +02:00 |
|
Erik Zandvliet
|
373b9afd32
|
Allow for multiple SPS/PPS in AVCC Box
|
2018-08-30 18:32:50 +02:00 |
|
Thulinma
|
c392e3f6f9
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output.cpp
|
2018-08-30 13:53:21 +02:00 |
|
Thulinma
|
4f7b902453
|
JSON blocking fix + output reselect fix for early stream times
|
2018-08-30 13:52:27 +02:00 |
|
Thulinma
|
6ddc4adadf
|
Merge branch 'development' into LTS_development
|
2018-08-27 14:17:20 +02:00 |
|
Ramoe
|
33488da329
|
Added singular mode override for inputs
|
2018-08-27 14:13:25 +02:00 |
|
Ramoe
|
b839a9f618
|
EBML tweaks
|
2018-08-27 14:13:19 +02:00 |
|