Lasse Lehtinen 
								
							 
						 
						
							
							
								
							
							
	633bb60dc6  
						 
						
							
							
								
								
								Added tests for audio concatenation  
							
							
							
						 
						
							2018-03-23 17:37:29 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	21c28dea25  
						 
						
							
							
								
								
								Concatenation feature ( #287 )  
							
							... 
							
							
							
							* Creation of a feature to concatenate files into a new one.
* Update of the README
* Creation of the tests for the concatenation
* We use an array of videos instead of a path to a text files
* We use the bundle Temporary File System instead of getcwd 
							
						 
						
							2017-02-14 13:55:07 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxime Veber 
								
							 
						 
						
							
							
								
							
							
	8f3b65dec6  
						 
						
							
							
								
								
								Add support for aac codec of ffmpeg3  
							
							
							
						 
						
							2016-12-05 18:12:12 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	863fd1b70f  
						 
						
							
							
								
								
								Fix file name  
							
							
							
						 
						
							2015-01-30 19:52:57 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									sylvainv 
								
							 
						 
						
							
							
								
							
							
	475d1a508a  
						 
						
							
							
								
								
								Added watermark functionality and unit tests  
							
							
							
						 
						
							2014-07-28 17:27:12 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	fca866e1d8  
						 
						
							
							
								
								
								Fix using rotate and resize filters at the same time ( #78 )  
							
							
							
						 
						
							2013-11-29 14:21:21 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	92499c1923  
						 
						
							
							
								
								
								Add audio test file  
							
							
							
						 
						
							2012-04-13 14:24:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	af18e54196  
						 
						
							
							
								
								
								Add tests for FFMpeg and FFProbe  
							
							
							
						 
						
							2012-04-13 11:01:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	11345d6367  
						 
						
							
							
								
								
								Initila Import  
							
							
							
						 
						
							2012-04-13 10:20:54 +02:00