| 
								
								
									 cat | 63f9fb52a5 | LSP / embed support for appending a string to the video url | 2015-11-20 12:11:00 +01:00 |  | 
				
					
						| 
								
								
									 Balder | 689129e805 | Merge branch 'development' into LTS_development | 2015-11-19 14:04:22 +01:00 |  | 
				
					
						| 
								
								
									 Balder | d8bfe8cebc | Fixed ability to disable video or audio tracks from HTTP output. | 2015-11-19 14:02:21 +01:00 |  | 
				
					
						| 
								
								
									 Balder | 7d9d4e26ae | fixed LTS tag for request url | 2015-11-19 13:53:22 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | c51f1b4955 | Merge branch 'development' into LTS_development # Conflicts:
#	src/input/input_buffer.cpp | 2015-11-16 16:16:44 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | f268988354 | Fixed buffer incorrectly nulling indexes for live streams. | 2015-11-16 16:15:52 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 2bc333956a | Merge branch 'development' into LTS_development | 2015-11-16 11:44:19 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | c194396215 | Clarified valid page numbers debug message. | 2015-11-16 11:44:11 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | bd836f247d | Merge branch 'development' into LTS_development | 2015-11-12 11:11:40 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | e20761e8c7 | Fix the case when a keyframe is not the first data pushed. | 2015-11-12 11:11:32 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 4db86ab2bb | Fixed HTTP-based CONN_PLAY triggers URLs | 2015-11-12 10:13:16 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 35b2dd6bee | Better working TS input, Pro side. Code by Erik Zandvliet. | 2015-11-05 17:11:04 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 01e9a45335 | Clarified comment | 2015-10-29 16:50:36 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | 67e1a832a2 | Removed confusing comments. | 2015-10-29 16:34:37 +01:00 |  | 
				
					
						| 
								
								
									 ozzay | e0ab83e61c | MP4 keyframe problem fixed | 2015-10-29 16:26:09 +01:00 |  | 
				
					
						| 
								
								
									 Thulinma | d504bbe720 | Merge branch 'development' into LTS_development # Conflicts:
#	src/input/input_buffer.cpp | 2015-10-20 15:36:33 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 9df850a149 | Fix for repushing. | 2015-10-20 15:35:21 +02:00 |  | 
				
					
						| 
								
								
									 cat | 718c0b7f35 | embed selfdetection fix | 2015-10-20 11:40:36 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 58d4015af2 | Merge branch 'development' into LTS_development | 2015-10-20 11:39:57 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 3ed0d1b3a3 | Merge branch 'development' into LTS_development | 2015-10-19 16:59:36 +02:00 |  | 
				
					
						| 
								
								
									 cat | 718d009f9f | embed exclude for IE/FF fix | 2015-10-19 16:47:52 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | de1d202457 | Made RTSP max send value runtime configurable. | 2015-10-14 14:30:28 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | e3f324e9af | Merge branch 'development' into LTS_development | 2015-10-14 11:19:08 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | b28b463662 | Improved HLS bandwidth accuracy. | 2015-10-14 11:18:56 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 279add438a | Implemented triggers. Merged from code by Wouter Spruit, with additions by yours truly. | 2015-10-14 10:48:00 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | eb6b98b219 | Merge branch 'development' into LTS_development # Conflicts:
#	src/controller/controller.cpp | 2015-10-14 10:38:59 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 3ba11441a1 | Improved flow of controller main function, made config file only re-write if updates were actually necessary, failure to open a stream input now fails the output correctly. | 2015-10-14 10:25:58 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 6b21e06c76 | Merge branch 'development' into LTS_development | 2015-10-13 15:56:53 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 73ef41e97b | Properly trigger failure state on streams when connection to source fails. | 2015-10-13 15:55:26 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 330117b1f4 | Merge branch 'development' into LTS_development | 2015-10-13 15:34:58 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 2f4a4660d0 | Fixed controller breaking when all connectors are deleted simultaneously. | 2015-10-13 15:34:24 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 21ce93f520 | Haha. | 2015-10-13 12:47:07 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 9c8fbb2ac3 | Merge branch 'development' into LTS_development | 2015-10-08 14:41:44 +02:00 |  | 
				
					
						| 
								
								
									 cat | 67dc1848e7 | embed mp4 no ff/ie | 2015-10-08 14:41:19 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | c390035523 | Merge branch 'development' into LTS_development # Conflicts:
#	src/io.cpp | 2015-10-08 13:58:43 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | c20b8f2081 | Fixed newlines in debug messages. Also, backported various Pro edition fixes that belonged in OS edition. | 2015-10-08 13:54:54 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 8fb8a98c5f | Pro side of JSON library updates. | 2015-10-07 11:06:22 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 74c8932106 | Merge branch 'development' into json_mod_LTS # Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output_http_internal.cpp | 2015-10-07 11:05:49 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 6d25774b94 | Improved performance of FLV input and generic input IO class. | 2015-10-06 16:36:06 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 16d38459b6 | Made JSON library non-recursive. Co-authored with Diederick. | 2015-10-06 13:21:14 +02:00 |  | 
				
					
						| 
								
								
									 Erik Zandvliet | b493976f90 | MP4 HEVC fix | 2015-10-05 17:08:18 +02:00 |  | 
				
					
						| 
								
								
									 Erik Zandvliet | 01472ca88d | Fix for TS Input CPU Usage | 2015-10-05 17:08:10 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 0c94e17e70 | Fixed aspect ratios in MP4. | 2015-09-29 14:41:34 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | c9a30c2816 | Improved on/off display for streams. | 2015-09-29 11:03:26 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 24c17e9466 | Tuned down debug verbosity for live streams significantly. | 2015-09-26 22:41:15 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 9903cd4322 | Removed useless debug message. | 2015-09-25 21:11:40 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 76529664e6 | Merge branch 'development' into LTS_development | 2015-09-25 20:58:58 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 94dafb7888 | Made generic output debug message about "actually loaded..." clearer, changed level to warn. | 2015-09-25 20:58:42 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 1110f79548 | Fixed completeKeyReady flag to only wait for selected tracks, not all tracks. | 2015-09-25 20:57:09 +02:00 |  | 
				
					
						| 
								
								
									 Thulinma | 5c3ff12946 | Fixed support for MP4 files without CTTS box in a track header. | 2015-09-25 00:36:09 +02:00 |  |