Erik Zandvliet
|
3c48a6c03c
|
Embedding of flash players
|
2016-01-26 14:14:12 +01:00 |
|
Thulinma
|
74c8932106
|
Merge branch 'development' into json_mod_LTS
# Conflicts:
# lib/shared_memory.cpp
# src/controller/controller.cpp
# src/io.cpp
# src/output/output.cpp
# src/output/output_http_internal.cpp
|
2015-10-07 11:05:49 +02:00 |
|
Thulinma
|
16d38459b6
|
Made JSON library non-recursive.
Co-authored with Diederick.
|
2015-10-06 13:21:14 +02:00 |
|
Thulinma
|
d8051984f2
|
Merge branch 'development' into LTS_development
|
2015-09-03 17:55:47 +02:00 |
|
Thulinma
|
096b289cdf
|
Updated --version argument to give more detailed output.
|
2015-09-03 17:54:20 +02:00 |
|
Thulinma
|
569ef07f29
|
Merge branch 'development' into LTS_development
# Conflicts:
# lib/stream.cpp
# src/output/output_http_internal.cpp
|
2015-07-21 23:51:46 +02:00 |
|
Thulinma
|
fce83c903b
|
Make internal HTTP output correctly serve embed codes for newer stream types.
|
2015-07-21 23:07:41 +02:00 |
|
Thulinma
|
e0c9173f9a
|
Merge branch 'development' into LTS_development
|
2015-05-12 11:23:08 +02:00 |
|
Thulinma
|
a3bf393bea
|
Added generic CORS header adder, now used in controller, HLS output and internal HTTP handler.
|
2015-05-12 11:23:00 +02:00 |
|
Thulinma
|
ac540cdd1d
|
LTS feature: Added support for setting/overriding the error text for failed streams.
|
2015-04-17 02:01:27 +02:00 |
|
Erik Zandvliet
|
d296ac60bb
|
Fixed folder support
|
2015-04-07 14:39:39 +02:00 |
|
Thulinma
|
4bdbd82f66
|
LTS Commits
|
2015-04-05 21:38:36 +02:00 |
|
Erik Zandvliet
|
9b6312ca01
|
Switch to CMake
|
2015-04-02 09:55:33 +02:00 |
|
Thulinma
|
7f4e92980c
|
Fixed SMIL output.
|
2015-02-26 14:09:52 +01:00 |
|
Thulinma
|
43d35cf29b
|
Converted previously hardcoded default sizes for shared memory pages to defines.
|
2015-01-27 12:03:52 +01:00 |
|
Thulinma
|
a9bf4fea4a
|
Further improvement to error handling of HTTP internal output.
|
2014-12-11 12:41:10 +01:00 |
|
Thulinma
|
8fa8a5d736
|
Fixed JSON error responses to internal HTTP output.
|
2014-12-11 12:23:19 +01:00 |
|
Thulinma
|
78aa855084
|
Fixed HTTP embed code problems.
|
2014-12-07 00:22:23 +01:00 |
|
Thulinma
|
fbb3032fe4
|
Added json_*.js output for pure JSON-only format.
|
2014-11-13 17:29:45 +01:00 |
|
Thulinma
|
455bce2c34
|
Further fixes to HTTP.
|
2014-11-07 21:07:19 +01:00 |
|
Thulinma
|
e6fce96650
|
Fixed info_streamname.js output, was outputting embed_streamname.js output instead.
|
2014-11-05 15:34:59 +01:00 |
|
Thulinma
|
d457046420
|
Converted HTTP based outputs to new and improved mechanism, increasing robustness and efficiency.
|
2014-10-31 00:38:25 +01:00 |
|