Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								83306e0ee1
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2016-06-17 11:26:04 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf477ea401
								
							
						 | 
						
							
							
								
								Fixed memory corruption bug in Output::seek()
							
							
							
							
							
						 | 
						
							2016-06-17 11:25:56 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								11897ace53
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2016-06-14 15:26:23 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cat
								
							 
						 | 
						
							
							
							
							
								
							
							
								589dcd21ea
								
							
						 | 
						
							
							
								
								LSP: preview height.. force
							
							
							
							
							
						 | 
						
							2016-06-14 15:26:08 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								0465b2000d
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2016-06-14 12:24:04 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cat
								
							 
						 | 
						
							
							
							
							
								
							
							
								680f9acfa8
								
							
						 | 
						
							
							
								
								LSP: fixed embed option propagation; invisible but clickable menu
							
							
							
							
							
						 | 
						
							2016-06-14 12:23:48 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								443d4fb9ea
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2016-06-14 09:37:35 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cat
								
							 
						 | 
						
							
							
							
							
								
							
							
								9fdb550735
								
							
						 | 
						
							
							
								
								LSP: added rolling update message
							
							
							
							
							
						 | 
						
							2016-06-14 09:36:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cat
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b5e18db40
								
							
						 | 
						
							
							
								
								LSP: improved preview player position
							
							
							
							
							
						 | 
						
							2016-06-14 09:36:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cat
								
							 
						 | 
						
							
							
							
							
								
							
							
								9501694165
								
							
						 | 
						
							
							
								
								LSP: prevent double triggers when using enter on buttons in the input container
							
							
							
							
							
						 | 
						
							2016-06-14 09:36:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cat
								
							 
						 | 
						
							
							
							
							
								
							
							
								2fc49dc81e
								
							
						 | 
						
							
							
								
								LSP: cache update md5s for 1hr instead of 1day and delete the cache after requesting a rolling update
							
							
							
							
							
						 | 
						
							2016-06-14 09:36:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4de779846
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2016-06-10 14:25:22 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea18815676
								
							
						 | 
						
							
							
								
								Fixed slow embed code (internal HTTP output) problem
							
							
							
							
							
						 | 
						
							2016-06-10 14:22:29 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								903786df60
								
							
						 | 
						
							
							
								
								Add buffer/select mismatch check in Output class, tweak seek abort debug message levels to be WARN instead of INFO.
							
							
							
							
							
						 | 
						
							2016-06-10 14:22:19 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								722738ffb0
								
							
						 | 
						
							
							
								
								Fixed VoD slow initial load problem.
							
							
							
							
							
						 | 
						
							2016-06-10 14:22:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								055866e2fb
								
							
						 | 
						
							
							
								
								Tweaked seek/isReadyForPlay implementations, fix HLS support for large key durations.
							
							
							
							
							
						 | 
						
							2016-06-10 14:20:17 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								a131557a43
								
							
						 | 
						
							
							
								
								Added proper buffering of not-yet-accepted tracks.
							
							
							
							
							
						 | 
						
							2016-06-10 14:18:01 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c89122a52
								
							
						 | 
						
							
							
								
								Improved output default seek position and completeKeyReady logic
							
							
							
							
							
						 | 
						
							2016-06-10 14:17:42 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								6babfe64c6
								
							
						 | 
						
							
							
								
								Fixed bandwidth sometimes being wrongly measured.
							
							
							
							
							
						 | 
						
							2016-06-09 18:43:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								ed982b9eb3
								
							
						 | 
						
							
							
								
								Added/tweaked debug messages for stats
							
							
							
							
							
						 | 
						
							2016-06-09 18:42:32 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								54b9079ab1
								
							
						 | 
						
							
							
								
								Fixed slow embed code (internal HTTP output) problem
							
							
							
							
							
						 | 
						
							2016-06-09 15:17:40 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								c4d4671281
								
							
						 | 
						
							
							
								
								Add buffer/select mismatch check in Output class, tweak seek abort debug message levels to be WARN instead of INFO.
							
							
							
							
							
						 | 
						
							2016-06-09 12:46:33 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								c8c81b9cb5
								
							
						 | 
						
							
							
								
								Fixed VoD slow initial load problem.
							
							
							
							
							
						 | 
						
							2016-06-08 12:02:15 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								7483bd9fd4
								
							
						 | 
						
							
							
								
								Tweaked seek/isReadyForPlay implementations, fix HLS support for large key durations.
							
							
							
							
							
						 | 
						
							2016-06-08 00:01:24 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6ff699ad8
								
							
						 | 
						
							
							
								
								Added proper buffering of not-yet-accepted tracks.
							
							
							
							
							
						 | 
						
							2016-06-07 23:24:52 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c41142a57
								
							
						 | 
						
							
							
								
								RTMP track re-selection timer added.
							
							
							
							
							
						 | 
						
							2016-06-07 15:25:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								7c46f008a8
								
							
						 | 
						
							
							
								
								Simplified and fortified MP4 live code.
							
							
							
							
							
						 | 
						
							2016-06-07 15:25:36 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								fecfc20052
								
							
						 | 
						
							
							
								
								Improved output default seek position and completeKeyReady logic
							
							
							
							
							
						 | 
						
							2016-06-07 15:24:11 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								6c723f6ca0
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2016-06-06 16:31:12 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								425aa3059f
								
							
						 | 
						
							
							
								
								Optimized waiting for streams/tracks.
							
							
							
							
							
						 | 
						
							2016-06-06 16:31:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								1818aca35b
								
							
						 | 
						
							
							
								
								Fixed RTMP push failing if wait time too long.
							
							
							
							
							
						 | 
						
							2016-06-06 16:30:52 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								fcd11f44c4
								
							
						 | 
						
							
							
								
								Optimized waiting for streams/tracks.
							
							
							
							
							
						 | 
						
							2016-06-06 16:30:30 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								326061ca18
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2016-06-06 12:19:01 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc93a8fa4e
								
							
						 | 
						
							
							
								
								Socket internal data counters now 64 bits unsigned integers
							
							
							
							
							
						 | 
						
							2016-06-06 12:18:48 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								6fec8fae70
								
							
						 | 
						
							
							
								
								Improved MP4 delay, made MP4 live slightly more readable.
							
							
							
							
							
						 | 
						
							2016-06-06 01:10:10 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								b3bce527f8
								
							
						 | 
						
							
							
								
								Now nulling thisPacket on output reconnect().
							
							
							
							
							
						 | 
						
							2016-06-06 01:09:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								8edc642884
								
							
						 | 
						
							
							
								
								Fixed a typo.
							
							
							
							
							
						 | 
						
							2016-06-04 21:04:48 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7962fce26
								
							
						 | 
						
							
							
								
								Fixed IPv6 addresses in hostnames in info_ json_ and embed_ URLs as well as .smil URLs.
							
							
							
							
							
						 | 
						
							2016-06-03 11:00:38 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ecce58e3c
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	CMakeLists.txt
#	lib/dtsc.h
#	lib/dtscmeta.cpp
#	lib/mp4_generic.cpp
#	lib/mp4_ms.cpp
#	lib/procs.cpp
#	lib/socket.cpp
#	lib/stream.cpp
#	lib/stream.h
#	lib/ts_packet.cpp
#	src/analysers/dtsc_analyser.cpp
#	src/controller/controller.cpp
#	src/controller/controller_capabilities.cpp
#	src/controller/controller_statistics.cpp
#	src/controller/controller_storage.cpp
#	src/controller/controller_storage.h
#	src/controller/controller_streams.cpp
#	src/input/input.cpp
#	src/input/input.h
#	src/input/input_buffer.cpp
#	src/input/input_buffer.h
#	src/input/input_dtsc.cpp
#	src/io.cpp
#	src/io.h
#	src/output/mist_out.cpp
#	src/output/output.cpp
#	src/output/output_hls.cpp
#	src/output/output_hls.h
#	src/output/output_hss.h
#	src/output/output_http_internal.cpp
#	src/output/output_httpts.h
#	src/output/output_progressive_flv.cpp
#	src/output/output_progressive_mp3.cpp
#	src/output/output_raw.cpp
#	src/output/output_rtmp.cpp
#	src/output/output_rtmp.h
#	src/output/output_ts.cpp 
							
						 | 
						
							2016-06-02 14:50:22 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								d8f57afae1
								
							
						 | 
						
							
							
								
								Fixed push trigger naming in LSP
							
							
							
							
							
						 | 
						
							2016-06-02 14:07:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3638d8405d
								
							
						 | 
						
							
							
								
								Now nulling thisPacket on output reconnect().
							
							
							
							
							
						 | 
						
							2016-06-02 14:07:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								837b2b5d4f
								
							
						 | 
						
							
							
								
								Added resume support and quick negotiation support from Pro, as well as support for stream-type inputs.
							
							
							
							
							
						 | 
						
							2016-06-02 14:07:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cat
								
							 
						 | 
						
							
							
							
							
								
							
							
								d4e2654f24
								
							
						 | 
						
							
							
								
								LSP remove graph coords option
							
							
							
							
							
						 | 
						
							2016-06-02 14:07:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cat
								
							 
						 | 
						
							
							
							
							
								
							
							
								56e9b79d68
								
							
						 | 
						
							
							
								
								LSP: IPv6 compat fix, autoplay default on, push page LTSified
							
							
							
							
							
						 | 
						
							2016-06-02 14:07:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								0b2355c5bb
								
							
						 | 
						
							
							
								
								Fixed IPv6 addresses in hostnames in info_ json_ and embed_ URLs as well as .smil URLs.
							
							
							
							
							
						 | 
						
							2016-06-02 14:07:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c9c6fa7ba
								
							
						 | 
						
							
							
								
								Backported various little edits from Pro edition.
							
							
							
							
							
						 | 
						
							2016-06-02 14:07:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								7398a88f2f
								
							
						 | 
						
							
							
								
								Removed some dead old Pro code.
							
							
							
							
							
						 | 
						
							2016-05-31 20:21:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								d048aaccc4
								
							
						 | 
						
							
							
								
								Forwardported some free version changes to Pro.
							
							
							
							
							
						 | 
						
							2016-05-30 16:03:52 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								29f40890e7
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2016-05-29 09:56:07 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								ef9938da0c
								
							
						 | 
						
							
							
								
								Actually really made the default install prefix /usr
							
							
							
							
							
						 | 
						
							2016-05-29 09:36:15 +02:00 | 
						
						
							
							
							
							
								
							
							
						 |