Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	
	
	fab3638caf 
 
						 
						
							
							
								
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2018-11-24 08:32:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	
	
	bf19f705a8 
 
						 
						
							
							
								
								
								Fix formatting  
							
							
							
						 
						
							2018-11-23 21:36:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja Lukin 
								
							 
						 
						
							
							
								
							
							
	
	
	fa2f89a0cf 
 
						 
						
							
							
								
								
								fixed formatting  
							
							
							
						 
						
							2018-11-23 21:27:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ilja Lukin 
								
							 
						 
						
							
							
								
							
							
	7b98238fa2  
						 
						
							
							
								
								
								added unit test for custom frame filter  
							
							
							
						 
						
							2018-11-23 20:14:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jon Hassall 
								
							 
						 
						
							
							
								
							
							
	fa37258502  
						 
						
							
							
								
								
								Added custom filters for Audio, in the same way as custom filters are available for Video  
							
							
							
						 
						
							2018-10-20 14:36:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Shaked Klein Orbach 
								
							 
						 
						
							
							
								
							
							
	afc236985e  
						 
						
							
							
								
								
								fix identation  
							
							
							
						 
						
							2018-03-08 10:53:38 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Shaked Klein Orbach 
								
							 
						 
						
							
							
								
							
							
	fcd494f723  
						 
						
							
							
								
								
								improve tests, validate frame file type  
							
							
							
						 
						
							2018-03-07 14:27:27 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Shaked Klein Orbach 
								
							 
						 
						
							
							
								
							
							
	9fe417745e  
						 
						
							
							
								
								
								add phpdoc & test png files  
							
							
							
						 
						
							2018-03-06 17:16:37 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Shaked Klein Orbach 
								
							 
						 
						
							
							
								
							
							
	ae92dd5887  
						 
						
							
							
								
								
								allow to set frame file type instead of hardcoded jpg  
							
							
							
						 
						
							2018-03-05 18:59:57 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Kyle Tse 
								
							 
						 
						
							
							
								
							
							
	4cfcabd7b5  
						 
						
							
							
								
								
								Support resize and watermark in ordering. ( #343 )  
							
							... 
							
							
							
							* Support multiple -vf commands
Marge Filters into one command
* Ordering Scale
Using -vf to scale instead of -s to have ordering
* Correct the ResizeFilterTest
* Remove useless comments
* Fixed filter bug
Add checking on filters if only one process.
* Fixed typo error 
							
						 
						
							2017-06-27 23:18:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Nikolaou 
								
							 
						 
						
							
							
								
							
							
	e8b247891b  
						 
						
							
							
								
								
								Fix missing audio artwork metadata on multiple exports ( #340 )  
							
							... 
							
							
							
							When the metadata filter is applied on an `Audio` media, the `artwork`
parameter was being unset from the metadata array.
Saving the same `Audio` instance into multiple formats generated the
correct commands for the first export, but the subsequent commands were
missing the `artwork` parameter.
This commit fixes this issue by copying (by value) the `metaArr`
property to a local variable each time the filter is applied. 
							
						 
						
							2017-04-12 14:40:31 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	ecd50cd5f1  
						 
						
							
							
								
								
								Audio Clip ( #314 )  
							
							... 
							
							
							
							* add missing headers
* add audio clip filter and improve timecode
* php 5.4 :(
* prevent audio from being reencoded
* php 5.x: Really?
* fix tests... I need to concentrate... 
							
						 
						
							2017-03-06 10:17:12 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	7adc8c73c0  
						 
						
							
							
								
								
								Merge branch 'master' into multipleframes  
							
							
							
						 
						
							2017-01-13 12:28:36 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	31629f7162  
						 
						
							
							
								
								
								Merge branch 'master' into addAudioMetadata  
							
							
							
						 
						
							2017-01-13 12:12:26 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	c90f26724c  
						 
						
							
							
								
								
								Creation of the tests for the ExtractMultipleFramesFilter class  
							
							
							
						 
						
							2017-01-11 12:03:54 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									shadrech 
								
							 
						 
						
							
							
								
							
							
	89098b24a2  
						 
						
							
							
								
								
								Add metadata to audio files | completed tests  
							
							
							
						 
						
							2017-01-09 14:26:40 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									shadrech 
								
							 
						 
						
							
							
								
							
							
	8cfb17682f  
						 
						
							
							
								
								
								Add metadata to audio files - feature  
							
							
							
						 
						
							2017-01-09 13:41:32 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	ac3e8f16ca  
						 
						
							
							
								
								
								We use getMote instead of createMock  
							
							
							
						 
						
							2016-12-21 12:43:57 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	bbe94784c2  
						 
						
							
							
								
								
								Addition of the tests  
							
							
							
						 
						
							2016-12-21 10:26:51 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	5ef964f2b5  
						 
						
							
							
								
								
								Fixed bugs in the tests  
							
							
							
						 
						
							2016-11-16 14:46:11 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	e1625f1f94  
						 
						
							
							
								
								
								Modification of the filters  
							
							
							
						 
						
							2016-11-16 14:11:11 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Patrik Karisch 
								
							 
						 
						
							
							
								
							
							
	f9c6316bad  
						 
						
							
							
								
								
								Cleanup phpunit configs and PSR-4 autoloading and namespaces for tests  
							
							
							
						 
						
							2016-03-06 23:38:04 +01:00