| 
								
								
									 Thulinma | bf1949f5ab | Merge branch 'development' into LTS_development | 2017-02-28 17:31:17 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 4b2392ee4b | Added missing pragma header in bitfields.h | 2017-02-28 17:30:22 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | ef3f4aaf1a | Unified all push-in-enabled outputs into a single style/function of accepting incoming pushes | 2017-02-28 14:08:08 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | daa0833970 | Merge branch 'development' into LTS_development # Conflicts:
#	src/output/output.h
#	src/output/output_rtmp.cpp | 2017-02-28 14:07:18 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 9a783a782d | Unified all push-in-enabled outputs into a single style/function of accepting incoming pushes | 2017-02-28 14:05:37 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 88749d2259 | Added sourceURI to stream metadata structures | 2017-02-28 13:59:38 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | ec240fb1af | Unified all input types into a single flexible type | 2017-02-28 13:58:20 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | e352a2fc38 | Merge branch 'development' into LTS_development | 2017-02-28 13:58:09 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 8866b299fb | Unified all input types into a single flexible type | 2017-02-28 13:57:59 +01:00 |  | 
				
					
						| 
								
								
									 Erik Zandvliet | 5e29ff5bb6 | Merge branch 'development' into LTS_development | 2017-02-22 14:02:24 +01:00 |  | 
				
					
						| 
								
								
									 Erik Zandvliet | 56a85cdab5 | Minor fixes for MP4 VoD assets > 4GB | 2017-02-22 13:59:39 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 640a1ec575 | RTSP now counts UDP bytes in/out on the main TCP connection | 2017-02-02 11:31:06 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 7b1ef6c76e | Fixed RTSP input not counting as input, fixed UDP-style input disconnect bug # Conflicts:
#	src/output/output.h | 2017-02-02 11:31:00 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 28106cf396 | Merge branch 'development' into LTS_development | 2017-02-02 11:30:05 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 23f0c388b5 | Added ability for sockets to override their byte counters | 2017-02-02 11:29:53 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 6f08fcd371 | Removed virtual keyword from RTMP getStatsName function | 2017-02-02 11:29:45 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 7ce1b0fdaf | Removed no-longer-used source-check in output class | 2017-02-02 11:29:27 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 8f96245d40 | Added unicode character support (UTF-8 <-> UTF-16 conversion) to JSON library | 2017-02-02 11:29:19 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 8756680d2e | Merge branch 'development' into LTS_development # Conflicts:
#	src/io.cpp | 2017-01-31 15:42:14 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 29f5d200cb | Removed breaking Cygwin-specific code | 2017-01-31 15:41:19 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | f48b2f2877 | Added live syncing code to RTSP output | 2017-01-31 15:04:08 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 92130699b1 | Added support for FU-A frames with Annex B data inside an SPS NAL unit | 2017-01-31 15:04:08 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | db3838e872 | Fix for RTSP input without VUI parameters (framerate autodetection) | 2017-01-31 15:04:08 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 454aa7e871 | Merge branch 'development' into LTS_development | 2017-01-31 14:58:47 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | a6731c3749 | Outputs no longer wait for data on non-live streams | 2017-01-31 14:58:41 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 4b0ea967d8 | Fixed no-audio streams in MP4 live in Chrome | 2017-01-31 14:52:47 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 9332a37a74 | Opera sucks just as much as Edge does. | 2017-01-31 14:52:05 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 6b03fe9f40 | MP4 speed optimize | 2017-01-31 14:51:55 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | ba5cbcb05f | Merge branch 'development' into LTS_development # Conflicts:
#	src/output/output_progressive_mp4.cpp | 2017-01-31 14:51:49 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 29669f24c4 | MP4 speed optimize | 2017-01-31 14:48:49 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 8a66913869 | Improved licensing system somewhat - not completely done yet | 2017-01-31 14:44:36 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | e4110502ee | No longer measure localhost in kernel-style measurements | 2017-01-31 14:44:21 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | eed7be8421 | Improved stats analyser, faster reloading of stats pages | 2017-01-31 14:44:01 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 50b97811ff | Merge branch 'development' into LTS_development | 2017-01-31 14:43:58 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 7f7b35acce | Faster reloading of stats pages | 2017-01-31 14:43:50 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 2c5b5c0460 | Load balancer improvements / source selection | 2017-01-31 14:42:43 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 055c87a2b3 | Added fallback option to load analyser | 2017-01-31 14:42:34 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 0c0bb5b3bf | Fixed stream statistics sometimes holding invalid values | 2017-01-31 14:42:25 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 478e9d7f47 | RTSP now uses ephemeral UDP ports instead of semi-random ports, preventing collisions | 2017-01-31 14:42:01 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | c867ea6d26 | Merge branch 'development' into LTS_development | 2017-01-31 14:41:41 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | dd8eed7920 | Various UDP socket fixes | 2017-01-31 14:41:16 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | e8995f2457 | Added H265 support to TS analyser | 2017-01-31 14:41:06 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 2e9eb51baf | Added -N option to not start input if not already running | 2017-01-31 14:40:51 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 40a06701bf | Fixed empty json output | 2017-01-31 14:40:26 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 35fbafc831 | Added arguments support to URL parser | 2017-01-31 14:39:33 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 40f1cec8f9 | Added 5 minute timeout to idle connections | 2017-01-31 14:38:49 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | b106a1eede | sharedServer class speed problem fixed | 2017-01-31 14:36:20 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 34d427e90d | You suck, Microsoft. | 2017-01-10 15:48:52 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 5b7972ebf1 | Merge branch 'development' into LTS_development | 2017-01-10 15:12:28 +01:00 |  | 
				
					
						| 
								
								
									 Cat | b9aa5c4d3e | embed - cancel stall timeout properly | 2017-01-10 15:12:20 +01:00 |  |