Thulinma
|
6b1db9d0ec
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input.cpp
|
2017-07-26 17:01:52 +02:00 |
|
Thulinma
|
3446d022e8
|
Added header read speed timers, simplified header logic for VoD.
|
2017-07-26 17:00:36 +02:00 |
|
Thulinma
|
d42bf9777e
|
Merge branch 'development' into LTS_development
# Conflicts:
# CMakeLists.txt
# src/input/input_buffer.cpp
|
2017-07-22 18:55:12 +02:00 |
|
Thulinma
|
45e4cddec9
|
Updated Input class with preRun() and checkArguments() instead of single setup() function
|
2017-07-22 18:53:05 +02: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 |
|
Thulinma
|
b71765e6bc
|
Buffer now reports JSON blob with stream details and possible issues, improved DRY/RECOVER behaviour
|
2016-10-11 15:13:20 +02:00 |
|
Thulinma
|
4c9c6fa7ba
|
Backported various little edits from Pro edition.
|
2016-06-02 14:07:21 +02:00 |
|
Thulinma
|
d048aaccc4
|
Forwardported some free version changes to Pro.
|
2016-05-30 16:03:52 +02:00 |
|
Thulinma
|
263dee7b25
|
Added push-related API calls to controller, made outputs able to wait for playable streams.
|
2016-05-11 13:55:23 +02:00 |
|
Thulinma
|
61b66e349e
|
Added onCrash handler for inputs, buffer now does proper cleanup when crashing.
|
2016-04-22 09:30:32 +02:00 |
|
ozzay
|
1c3e143709
|
Recording functionality by Diederick Huijbers, slightly tweaked.
|
2016-02-12 16:29:08 +01:00 |
|
Erik Zandvliet
|
e90c3193d6
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
# src/input/input_buffer.h
|
2015-12-17 19:25:16 +01:00 |
|
Erik Zandvliet
|
a604d616f7
|
'Ugly' fix for dissapearing metadata
|
2015-12-17 19:22:55 +01:00 |
|
Thulinma
|
ed5440e382
|
Added ability to disable resume support for live streams.
|
2015-11-27 14:51:15 +01:00 |
|
Thulinma
|
6b2a158d9c
|
Backported various fixes by Erik Zandvliet, also added better handling of re-pushes.
|
2015-05-21 20:15:09 +02:00 |
|
Erik Zandvliet
|
926dd01995
|
Fixed removing pages at the right points.
|
2015-05-20 14:45:38 +02:00 |
|
Thulinma
|
4bdbd82f66
|
LTS Commits
|
2015-04-05 21:38:36 +02:00 |
|
Erik Zandvliet
|
d370ef4eac
|
Working multi-input
|
2015-04-02 09:56:47 +02:00 |
|
Thulinma
|
8542281ac2
|
JSON-based input selection.
|
2014-10-02 16:12:19 +02:00 |
|
Thulinma
|
c6e86a697b
|
Various RTMP fixes.
|
2014-06-07 01:02:56 +02:00 |
|
Thulinma
|
cd2fe225c5
|
Shared memory rewrite
|
2014-04-04 19:50:40 +02:00 |
|