Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								384836635f
								
							
						 | 
						
							
							
								
								*-exec: inputs now correctly throw away stderr, preventing ffmpeg lockups
							
							
							
							
							
						 | 
						
							2018-05-16 11:11:37 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								a084005644
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	src/output/output_progressive_mp4.cpp 
							
						 | 
						
							2018-05-16 11:10:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c41fee7c8
								
							
						 | 
						
							
							
								
								Fixed ELST box in mp4, and use it to fix track desync issues.
							
							
							
							
							
						 | 
						
							2018-05-16 10:55:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erik Zandvliet
								
							 
						 | 
						
							
							
							
							
								
							
							
								e53b14365c
								
							
						 | 
						
							
							
								
								Fixed ELST box in mp4, and use it to fix track desync issues.
							
							
							
							
							
						 | 
						
							2018-05-16 10:48:34 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Erik Zandvliet
								
							 
						 | 
						
							
							
							
							
								
							
							
								0fff6f8773
								
							
						 | 
						
							
							
								
								Skip at least some corruption in TS
							
							
							
							
							
						 | 
						
							2018-05-16 10:48:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								98c50762e8
								
							
						 | 
						
							
							
								
								Improve loop for TS input packet reader
							
							
							
							
							
						 | 
						
							2018-05-16 10:47:26 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								ecbb48dbfe
								
							
						 | 
						
							
							
								
								Fixed http_internal responses for offline streams
							
							
							
							
							
						 | 
						
							2018-05-16 10:47:14 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								7af419fdad
								
							
						 | 
						
							
							
								
								Added "deletestreamsource" call that deletes a stream AND the corresponding source file.
							
							
							
							
							
						 | 
						
							2018-05-09 13:39:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								31403f2685
								
							
						 | 
						
							
							
								
								HLS input rewrite/optimize/clarify/fun-ify
							
							
							
							
							
						 | 
						
							2018-05-09 12:24:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								ebb9b3d8c4
								
							
						 | 
						
							
							
								
								Fix for HLS streams with "m3u" in the stream name
							
							
							
							
							
						 | 
						
							2018-05-09 12:24:02 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ce7c29813
								
							
						 | 
						
							
							
								
								Changed playlist input timing to boottime-based instead of wallclock-based, split up realtime and regular main loops functions
							
							
							
							
							
							
							
							# Conflicts:
#	src/input/input.cpp 
							
						 | 
						
							2018-05-09 12:21:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								bbc31722bd
								
							
						 | 
						
							
							
								
								Generalized stream variables implementation
							
							
							
							
							
							
							
							# Conflicts:
#	lib/stream.cpp 
							
						 | 
						
							2018-05-09 10:40:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								94bb2aa0f1
								
							
						 | 
						
							
							
								
								Fix potential segfault in doSync
							
							
							
							
							
						 | 
						
							2018-05-09 10:24:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								92d14f52ea
								
							
						 | 
						
							
							
								
								Improved stream start handling
							
							
							
							
							
						 | 
						
							2018-05-09 10:12:35 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								f934d15a78
								
							
						 | 
						
							
							
								
								Removed automatic wildcard addition for DTSC input URLs
							
							
							
							
							
						 | 
						
							2018-05-09 09:41:26 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b9a731525
								
							
						 | 
						
							
							
								
								Fixed missing return statements in HLS input
							
							
							
							
							
						 | 
						
							2018-05-08 11:32:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								54e26f3ef4
								
							
						 | 
						
							
							
								
								Fixed HEVC codec display in HLS output
							
							
							
							
							
						 | 
						
							2018-04-30 17:06:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d93d78b8b
								
							
						 | 
						
							
							
								
								Add codec/resolution/framerate information to HLS index
							
							
							
							
							
							
							
							# Conflicts:
#	src/output/output_hls.cpp
#	src/output/output_hls.h 
							
						 | 
						
							2018-04-23 11:07:26 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								807324f133
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	src/output/output_hls.cpp
#	src/output/output_hls.h 
							
						 | 
						
							2018-04-23 11:04:49 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								06bda0240c
								
							
						 | 
						
							
							
								
								Add codec/resolution/framerate information to HLS index
							
							
							
							
							
						 | 
						
							2018-04-23 10:56:40 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								bf89c6a3c1
								
							
						 | 
						
							
							
								
								Implemented ?stream=STREAMNAME in load balancer
							
							
							
							
							
						 | 
						
							2018-04-19 11:08:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								d46eaf22e5
								
							
						 | 
						
							
							
								
								Added support for HTTP parameters in HTTPS protocol
							
							
							
							
							
						 | 
						
							2018-04-04 16:32:25 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								da5e15621e
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	src/output/output_http_internal.cpp 
							
						 | 
						
							2018-04-04 16:31:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								e39599894f
								
							
						 | 
						
							
							
								
								support for protocol detection in player.js internal default URL
							
							
							
							
							
						 | 
						
							2018-04-04 16:05:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f341297a5
								
							
						 | 
						
							
							
								
								Changed EBML and MP4 priorities
							
							
							
							
							
						 | 
						
							2018-03-27 15:58:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								266ab3a654
								
							
						 | 
						
							
							
								
								Implemented browser detection and handling of output-specific browser exceptions.
							
							
							
							
							
						 | 
						
							2018-03-27 15:58:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c67277d81
								
							
						 | 
						
							
							
								
								Changed EBML and MP4 priorities
							
							
							
							
							
						 | 
						
							2018-03-27 15:57:55 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								f65c759292
								
							
						 | 
						
							
							
								
								Implemented browser detection and handling of output-specific browser exceptions.
							
							
							
							
							
						 | 
						
							2018-03-27 15:57:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e303e0320
								
							
						 | 
						
							
							
								
								Geo IP based load balancing (requires external coords)
							
							
							
							
							
						 | 
						
							2018-03-22 12:35:59 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								75cefe9956
								
							
						 | 
						
							
							
								
								Added buffer and rate params to RTSP output
							
							
							
							
							
						 | 
						
							2018-03-22 10:41:52 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								62ae2929a3
								
							
						 | 
						
							
							
								
								Merge branch 'newStatus' into Pro_newStatus
							
							
							
							
							
							
							
							# Conflicts:
#	src/controller/controller_api.cpp
#	src/controller/controller_statistics.cpp
#	src/controller/controller_statistics.h
#	src/controller/controller_streams.cpp 
							
						 | 
						
							2018-03-21 14:50:04 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4ac68db54
								
							
						 | 
						
							
							
								
								Improved statistics and stream status
							
							
							
							
							
						 | 
						
							2018-03-21 14:46:22 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								355d55decc
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	src/controller/controller_api.cpp
#	src/controller/controller_api.h
#	src/controller/controller_statistics.cpp
#	src/controller/controller_statistics.h 
							
						 | 
						
							2018-03-20 20:15:10 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								6e0e66076d
								
							
						 | 
						
							
							
								
								WebSocket API in controller
							
							
							
							
							
						 | 
						
							2018-03-20 20:07:11 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								0dd602d5ca
								
							
						 | 
						
							
							
								
								WebSocket API in controller
							
							
							
							
							
						 | 
						
							2018-03-20 20:06:37 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								1b15fbff2b
								
							
						 | 
						
							
							
								
								Added HTTP info.js websocket mode
							
							
							
							
							
							
							
							# Conflicts:
#	src/output/output_http_internal.cpp 
							
						 | 
						
							2018-03-20 15:16:24 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								e06b14ce77
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	src/output/output_http.cpp
#	src/output/output_http_internal.cpp 
							
						 | 
						
							2018-03-20 15:11:19 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0bf1d14ec
								
							
						 | 
						
							
							
								
								Added HTTP info.js websocket mode
							
							
							
							
							
						 | 
						
							2018-03-20 15:06:37 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								798f099638
								
							
						 | 
						
							
							
								
								JSON output websocket support
							
							
							
							
							
						 | 
						
							2018-03-20 14:58:58 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								2443fcff92
								
							
						 | 
						
							
							
								
								Added new API JSON-based auth scheme
							
							
							
							
							
							
							
							# Conflicts:
#	src/controller/controller_api.cpp 
							
						 | 
						
							2018-03-20 14:58:06 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								d3d93eb4da
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
							
							
							# Conflicts:
#	src/controller/controller_api.cpp 
							
						 | 
						
							2018-03-20 14:56:49 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								f126b17ed1
								
							
						 | 
						
							
							
								
								Added new API JSON-based auth scheme
							
							
							
							
							
						 | 
						
							2018-03-20 14:54:51 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee55646141
								
							
						 | 
						
							
							
								
								Added Output::disconnect() call
							
							
							
							
							
						 | 
						
							2018-03-20 14:30:51 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								0385daabe8
								
							
						 | 
						
							
							
								
								Merge branch 'development' into LTS_development
							
							
							
							
							
						 | 
						
							2018-03-20 14:30:42 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								74baf8d4a4
								
							
						 | 
						
							
							
								
								Added Output::disconnect() call
							
							
							
							
							
						 | 
						
							2018-03-20 14:22:04 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								abda56ced8
								
							
						 | 
						
							
							
								
								No longer print RTSP data to stderr on transport error
							
							
							
							
							
						 | 
						
							2018-03-01 16:37:43 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								2dbdd855cd
								
							
						 | 
						
							
							
								
								Changed HLS playlist content type
							
							
							
							
							
						 | 
						
							2018-02-14 09:09:54 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								a51f0d1039
								
							
						 | 
						
							
							
								
								Buffer fixup
							
							
							
							
							
						 | 
						
							2018-02-13 16:06:18 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								def6c2266e
								
							
						 | 
						
							
							
								
								Even more TS input tweaks
							
							
							
							
							
						 | 
						
							2018-02-13 16:03:58 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thulinma
								
							 
						 | 
						
							
							
							
							
								
							
							
								87fb2fc5b9
								
							
						 | 
						
							
							
								
								Improved input descriptions
							
							
							
							
							
						 | 
						
							2018-02-13 13:05:35 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |