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
..
analysers	Load balancer fixes/improvements made during paper writing.	2016-07-20 11:07:46 +02:00
controller	Merge branch 'development' into LTS_development	2016-07-20 14:57:30 +02:00
input	MP4 language support in input, Timed Text input support (rudimentary, without styles)	2016-07-18 10:44:29 +02:00
output	Merge branch 'development' into LTS_development	2016-07-21 12:03:40 +02:00
embed.js	LSP/embed: fix for + in filenames in folder streams	2016-07-21 11:40:09 +02:00
icon.h	Converted HTTP based outputs to new and improved mechanism, increasing robustness and efficiency.	2014-10-31 00:38:25 +01:00
io.cpp	Backported from OS version edits.	2016-07-06 16:20:11 +02:00
io.h	Added proper buffering of not-yet-accepted tracks.	2016-06-10 14:18:01 +02:00
sourcery.cpp	Switch to CMake	2015-04-02 09:55:33 +02:00
xap.h	Converted HTTP based outputs to new and improved mechanism, increasing robustness and efficiency.	2014-10-31 00:38:25 +01:00