Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								17baf864d1
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	CMakeLists.txt 
							
						 | 
						
							2017-11-01 19:32:52 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e3df09831
								
							
						 | 
						
							
							
								
								SSL socket class, downloadertest application, HTTP::Downloader support for HTTPS connections, authentication, proxies and POST requests
							
							
							
							
							
						 | 
						
							2017-11-01 19:29:47 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								f910e3dc04
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	lib/http_parser.h 
							
						 | 
						
							2017-11-01 16:42:13 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce9aae3095
								
							
						 | 
						
							
							
								
								HTTP parser updates to Digest auth and support for getProxyUrl() for proxying, SendRequest with payload by reference.
							
							
							
							
							
						 | 
						
							2017-11-01 16:41:21 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								89b6ffdf47
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2017-11-01 16:36:07 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								a36cbfa1c5
								
							
						 | 
						
							
							
								
								Fixed URL encoding safe character list
							
							
							
							
							
						 | 
						
							2017-11-01 16:35:57 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								b2c5843d54
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2017-11-01 15:25:43 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								6b5016691d
								
							
						 | 
						
							
							
								
								Bumped DTSH version number to 4 for peak/average bit rate calculations
							
							
							
							
							
						 | 
						
							2017-11-01 15:25:36 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erik Zandvliet
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2e2193345
								
							
						 | 
						
							
							
								
								Fixed resetting rollOver count on seek for VoD TS files.
							
							
							
							
							
						 | 
						
							2017-10-26 15:11:35 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								058242842f
								
							
						 | 
						
							
							
								
								Fixed TS VoD, more or less (Erik will follow up with proper fix)
							
							
							
							
							
						 | 
						
							2017-10-26 15:11:29 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								fefbfe2375
								
							
						 | 
						
							
							
								
								Added support for scheduled pushes
							
							
							
							
							
						 | 
						
							2017-10-26 15:10:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								014eed32e8
								
							
						 | 
						
							
							
								
								Fixed recstart/recstop values in the past
							
							
							
							
							
						 | 
						
							2017-10-26 12:50:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erik Zandvliet
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4827ce615
								
							
						 | 
						
							
							
								
								Fixed TS PTS rollover support
							
							
							
							
							
						 | 
						
							2017-10-26 12:50:48 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								60e04c4058
								
							
						 | 
						
							
							
								
								Fix RTSP input compile
							
							
							
							
							
						 | 
						
							2017-10-26 11:13:24 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								a97d3e8d27
								
							
						 | 
						
							
							
								
								Add missing bandwidth to TS UDP output
							
							
							
							
							
						 | 
						
							2017-10-25 11:13:02 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e4dca8f84
								
							
						 | 
						
							
							
								
								Load balancer can now redirect, if given a protocol name.
							
							
							
							
							
						 | 
						
							2017-10-24 14:44:10 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								52816a8daa
								
							
						 | 
						
							
							
								
								Added ability to pass on URLs to load balancer
							
							
							
							
							
						 | 
						
							2017-10-24 14:44:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b9164910c
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2017-10-24 14:44:00 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								7550ce52e4
								
							
						 | 
						
							
							
								
								Added missing relative URL for HTML page stream output
							
							
							
							
							
						 | 
						
							2017-10-24 14:43:55 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3a8b9e2a8a
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2017-10-24 14:42:24 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erik Zandvliet
								
							 
						 | 
						
							
							
							
							
								
							
							
								cba0c0b38b
								
							
						 | 
						
							
							
								
								Calculate both average and peak bit rates
							
							
							
							
							
						 | 
						
							2017-10-24 14:42:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								761fbdc944
								
							
						 | 
						
							
							
								
								HTTP lib no longer returns empty variables in allVars()
							
							
							
							
							
						 | 
						
							2017-10-24 14:42:11 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								f8766b0567
								
							
						 | 
						
							
							
								
								Added Mu-law support to RTSP and WAV
							
							
							
							
							
						 | 
						
							2017-10-24 14:10:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								f5c1e6b573
								
							
						 | 
						
							
							
								
								RTSP pull input
							
							
							
							
							
							
							
							Includes TCP, UDP and authentication support 
							
						 | 
						
							2017-10-24 14:10:12 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								b81f980932
								
							
						 | 
						
							
							
								
								Added --ignore-sending-port option to RTSP output
							
							
							
							
							
						 | 
						
							2017-10-24 14:10:07 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								d700571922
								
							
						 | 
						
							
							
								
								URL parser fixes/improvements
							
							
							
							
							
						 | 
						
							2017-10-24 14:09:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								cac503f774
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	src/input/input.cpp 
							
						 | 
						
							2017-10-24 14:09:13 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								a27cf083e6
								
							
						 | 
						
							
							
								
								Added streamMainLoop function to Input class
							
							
							
							
							
						 | 
						
							2017-10-24 14:08:10 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								c7ab3ac858
								
							
						 | 
						
							
							
								
								UDP socket library improvements
							
							
							
							
							
						 | 
						
							2017-10-24 13:59:12 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								c22a3c6e0f
								
							
						 | 
						
							
							
								
								Added authentication support to HTTP library
							
							
							
							
							
						 | 
						
							2017-10-24 13:59:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								047aebdb27
								
							
						 | 
						
							
							
								
								URL parser fixes/improvements
							
							
							
							
							
						 | 
						
							2017-10-24 13:58:56 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								7d420d884e
								
							
						 | 
						
							
							
								
								Added support for type-less connector options (i.e. flags)
							
							
							
							
							
						 | 
						
							2017-10-24 13:54:43 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								b1f1dc47ba
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2017-10-24 10:46:28 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cat
								
							 
						 | 
						
							
							
							
							
								
							
							
								037d730f0f
								
							
						 | 
						
							
							
								
								LSP: display tracks with meta, type subtitle, and display both peak and average bitrate
							
							
							
							
							
						 | 
						
							2017-10-24 10:44:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Cat
								
							 
						 | 
						
							
							
							
							
								
							
							
								df2eaf4f01
								
							
						 | 
						
							
							
								
								LSP: show license msg in overview
							
							
							
							
							
						 | 
						
							2017-10-24 10:44:59 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3cb5774822
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	src/output/output.h
#	src/output/output_hls.cpp 
							
						 | 
						
							2017-10-20 14:25:27 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erik Zandvliet
								
							 
						 | 
						
							
							
							
							
								
							
							
								c1373fba17
								
							
						 | 
						
							
							
								
								Fixes hls crash on non-existing streams
							
							
							
							
							
						 | 
						
							2017-10-20 14:23:32 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erik Zandvliet
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5ebc0656a
								
							
						 | 
						
							
							
								
								Fix for MP3 in MP4
							
							
							
							
							
						 | 
						
							2017-10-18 12:46:47 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								acecdff31c
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2017-10-09 16:05:04 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erik Zandvliet
								
							 
						 | 
						
							
							
							
							
								
							
							
								90c017bfcd
								
							
						 | 
						
							
							
								
								Exit page load on !keepGoing()
							
							
							
							
							
						 | 
						
							2017-10-09 15:17:02 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								78b5c28116
								
							
						 | 
						
							
							
								
								Added recstartunix and recstopunix to time recordings by unix time (seconds, not millis)
							
							
							
							
							
						 | 
						
							2017-10-09 15:16:48 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								09cea3324e
								
							
						 | 
						
							
							
								
								Added local mode to load balancer, which only allows control from local interfaces.
							
							
							
							
							
						 | 
						
							2017-10-09 15:16:42 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								e05268f670
								
							
						 | 
						
							
							
								
								Load balancer now detects what streams are available on what servers, does not direct traffic if not configured
							
							
							
							
							
						 | 
						
							2017-10-09 15:16:37 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b360c8164
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	src/output/output.cpp
#	src/output/output_rtmp.cpp 
							
						 | 
						
							2017-09-29 16:21:50 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								178c888e56
								
							
						 | 
						
							
							
								
								Removed minSkipAhead, improved seeking algorithm.
							
							
							
							
							
						 | 
						
							2017-09-29 16:20:51 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								485a4ecbbe
								
							
						 | 
						
							
							
								
								Removed minSkipAhead, improved seeking algorithm.
							
							
							
							
							
						 | 
						
							2017-09-29 16:13:01 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								c466f4bcba
								
							
						 | 
						
							
							
								
								Corrected ts-exec: output format.
							
							
							
							
							
						 | 
						
							2017-09-29 16:13:01 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ramkoemar
								
							 
						 | 
						
							
							
							
							
								
							
							
								f77431d5a3
								
							
						 | 
						
							
							
								
								ts-exec
							
							
							
							
							
						 | 
						
							2017-09-28 16:19:47 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								08dc361e06
								
							
						 | 
						
							
							
								
								Added support for DVR option in TS input
							
							
							
							
							
						 | 
						
							2017-09-27 12:09:18 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								adb76e2cf8
								
							
						 | 
						
							
							
								
								Added TS output passthrough support
							
							
							
							
							
						 | 
						
							2017-09-27 12:09:18 +02:00 | 
						
						
							
							
							
							
								
							
							
						 |