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 |
|