| 
						
					 | 
					
						
						
							
						
						f0fbe6f4a3
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	.idea/misc.xml
#	.idea/workspace.xml
#	src/ffmpegconverter/Main.java 
						
						
					 | 
					
						2020-02-10 22:53:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b2e1cc83fc
					 | 
					
						
						
							
							Adds lots of improvements
						
						
						
						
						
						
					 | 
					
						2020-02-10 22:50:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6143ec9e3c
					 | 
					
						
						
							
							Updates to changes done while the server was down
						
						
						
						
						
						
						
						Better reading
Better output
Things which can be final are final
Adds more lines to prevent signs + songs instead of full subtitles 
						
						
					 | 
					
						2020-01-20 20:15:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						20e6df04f1
					 | 
					
						
						
							
							Rewrites a lot of code
						
						
						
						
						
						
						
						Streams are now parsed to objects, making it easier to get required information.
Improved styling.
Some better comments.
Better input parsing. 
						
						
					 | 
					
						2019-10-06 01:02:47 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0a39a69e73
					 | 
					
						
						
							
							Improves reading of input
						
						
						
						
						
						
					 | 
					
						2019-08-20 21:05:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						104d9ccb4b
					 | 
					
						
						
							
							Fixes some bugs and adds unfinished command parser
						
						
						
						
						
						
					 | 
					
						2019-06-14 13:08:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dbb5bc7f94
					 | 
					
						
						
							
							Adds surround to stereo
						
						
						
						
						
						
					 | 
					
						2018-12-18 00:55:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cfba434243
					 | 
					
						
						
							
							Adds hardsubbing of subtitles with same name as video file
						
						
						
						
						
						
						
						Better file collision detection
Adds debug mode to only render part of the video 
						
						
					 | 
					
						2018-11-13 11:33:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9713b3c06e
					 | 
					
						
						
							
							Hopefully fixes issues #1 and #2
						
						
						
						
						
						
						
						File collision handling similar to windows 
						
						
					 | 
					
						2018-10-02 12:26:34 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f9f52e4425
					 | 
					
						
						
							
							Adds missing files
						
						
						
						
						
						
					 | 
					
						2018-09-30 00:47:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |