Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	
	
	ab50f00774 
 
						 
						
							
							
								
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2018-10-04 15:52:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	
	
	ed22de7eb1 
 
						 
						
							
							
								
								
								fix   #547  
							
							
							
						 
						
							2018-10-04 15:42:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									george 
								
							 
						 
						
							
							
								
							
							
	706afe23d7  
						 
						
							
							
								
								
								readme improvements part 3  
							
							
							
						 
						
							2018-10-02 14:46:41 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									george 
								
							 
						 
						
							
							
								
							
							
	5551d0122a  
						 
						
							
							
								
								
								readme improvements part 2  
							
							
							
						 
						
							2018-10-01 21:52:57 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									george 
								
							 
						 
						
							
							
								
							
							
	bad8f77ba0  
						 
						
							
							
								
								
								readme improvements  
							
							
							
						 
						
							2018-10-01 21:42:48 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	
	
	279227ab2a 
 
						 
						
							
							
								
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2018-09-05 09:27:36 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Miroslav Nový 
								
							 
						 
						
							
							
								
							
							
	0b871e59e7  
						 
						
							
							
								
								
								Clip using input seek ( #543 )  
							
							... 
							
							
							
							Making video clip by input seeking 
							
						 
						
							2018-07-06 18:51:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lasse Lehtinen 
								
							 
						 
						
							
							
								
							
							
	633bb60dc6  
						 
						
							
							
								
								
								Added tests for audio concatenation  
							
							
							
						 
						
							2018-03-23 17:37:29 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Kartavenko 
								
							 
						 
						
							
							
								
							
							
	
	
	5737dbffd9 
 
						 
						
							
							
								
								
								#452  Update README.md  
							
							... 
							
							
							
							Add missing require statement. 
							
						 
						
							2017-12-05 13:23:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Ganev 
								
							 
						 
						
							
							
								
							
							
	d5fc9ed9db  
						 
						
							
							
								
								
								array representation backward compat for php5  
							
							
							
						 
						
							2017-11-08 18:32:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Ganev 
								
							 
						 
						
							
							
								
							
							
	fc5bfc691e  
						 
						
							
							
								
								
								cat walked on keyboard, apparently  
							
							
							
						 
						
							2017-11-07 19:43:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Ganev 
								
							 
						 
						
							
							
								
							
							
	607df6aa79  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/iganev/PHP-FFMpeg  
							
							
							
						 
						
							2017-11-07 11:01:48 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Ganev 
								
							 
						 
						
							
							
								
							
							
	5d4dd8de37  
						 
						
							
							
								
								
								forgot to update the README and describe the third waveform() param  
							
							
							
						 
						
							2017-11-07 11:01:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Ganev 
								
							 
						 
						
							
							
								
							
							
	
	
	a989b49df1 
 
						 
						
							
							
								
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2017-11-07 10:58:17 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Ganev 
								
							 
						 
						
							
							
								
							
							
	4b1033f8a2  
						 
						
							
							
								
								
								updated README.md to represent the full possible usage of the waveform generation  
							
							
							
						 
						
							2017-11-02 17:44:48 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	4bbb50f989  
						 
						
							
							
								
								
								fix readme typos  
							
							
							
						 
						
							2017-10-24 21:37:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	e482bfb84f  
						 
						
							
							
								
								
								add Crop documentation  
							
							
							
						 
						
							2017-10-16 17:36:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	3f5be50e68  
						 
						
							
							
								
								
								Merge branch 'master' into jens1o-isValid  
							
							
							
						 
						
							2017-10-16 17:03:34 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	8c16de99ad  
						 
						
							
							
								
								
								add FFProbe#isValid to readme  
							
							
							
						 
						
							2017-10-16 16:53:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	852b26539f  
						 
						
							
							
								
								
								remove api link  
							
							... 
							
							
							
							fixes  #420  
						
							2017-10-12 21:24:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	07d1732300  
						 
						
							
							
								
								
								fix typo;  closes   #404  
							
							
							
						 
						
							2017-09-19 18:26:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vaibhavraj Roham 
								
							 
						 
						
							
							
								
							
							
	30d5250376  
						 
						
							
							
								
								
								typo in heading ( #351 )  
							
							... 
							
							
							
							* typo in heading
Typo in heading
* updated readme
Updated README 
							
						 
						
							2017-04-25 10:45:09 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	2ddf9ae377  
						 
						
							
							
								
								
								add missing chapter about audio clipping in readme ( #329 )  
							
							
							
						 
						
							2017-04-12 12:58:04 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Pe Ell 
								
							 
						 
						
							
							
								
							
							
	ce99075059  
						 
						
							
							
								
								
								Fix Format classes namespace in README ( #320 )  
							
							
							
						 
						
							2017-03-06 09:42:40 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Laurent Marquet 
								
							 
						 
						
							
							
								
							
							
	84493739b4  
						 
						
							
							
								
								
								Remove not needed spaces ( #318 )  
							
							
							
						 
						
							2017-03-03 15:55:27 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	7cff2ecb23  
						 
						
							
							
								
								
								Update of the README ( #315 )  
							
							
							
						 
						
							2017-02-27 12:08:47 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Jens Hausdorf 
								
							 
						 
						
							
							
								
							
							
	4082f4678c  
						 
						
							
							
								
								
								update readme ( #312 )  
							
							
							
						 
						
							2017-02-27 11:52:12 -03: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	6ba011de3a  
						 
						
							
							
								
								
								Methods getAdditionalParams & setAdditionalParams which allow the user to pass additional parameters to the encoding request ( #284 )  
							
							... 
							
							
							
							* Modification of the format Video to add additional parameters based on user's desire
* Update of the README
* Working version of this feature. Still needs tests
* Fixing the tests of FFMPeg\Media\Video
* Setting up tests for the additionalParams feature
* Correction des tests
* Modifying tests. They work locally but not on Travis.
* Still trying to understand why Travis is throwing errors when PHPUnit is not.
* Add the additional params at the end of the command
* Fixed the tests and the way we add the parameters
* We remove log files 
							
						 
						
							2017-01-24 15:19:32 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	2b5d18f510  
						 
						
							
							
								
								
								Creation of a Gif Media to be able to extract gif animation based on video sequences ( #285 )  
							
							... 
							
							
							
							* Creation of a media to extract video sequences into gif files
* We add a gif method to the class Video to be able to use the Gif Media.
* Parameters where missing in the declaration of the gif function
* One parameter was badly defined in the gif method
* We use the proper media in the method gif
* We add a missing declaration in the Video class
* Update of the README file
* Modification of the README file
* We remove an empty class 
							
						 
						
							2017-01-24 15:03:51 -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 
								
							 
						 
						
							
							
								
							
							
	4c0777b7c4  
						 
						
							
							
								
								
								Merge branch 'master' into padding  
							
							
							
						 
						
							2017-01-13 11:53:59 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	ba17ad273a  
						 
						
							
							
								
								
								We update the README with this new filter  
							
							
							
						 
						
							2017-01-11 12:13:59 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									shadrech 
								
							 
						 
						
							
							
								
							
							
	48a0bdc13b  
						 
						
							
							
								
								
								Minor ammendment to README.md file  
							
							
							
						 
						
							2017-01-09 17:41:32 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									shadrech 
								
							 
						 
						
							
							
								
							
							
	8cfb17682f  
						 
						
							
							
								
								
								Add metadata to audio files - feature  
							
							
							
						 
						
							2017-01-09 13:41:32 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Malte Blättermann 
								
							 
						 
						
							
							
								
							
							
	f0ca0c950f  
						 
						
							
							
								
								
								Change installation method to composer require  
							
							... 
							
							
							
							The composer.json SHOULD NOT be edited by hand for installation. 
							
						 
						
							2017-01-04 10:12:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	52d32ec70b  
						 
						
							
							
								
								
								Update of the README  
							
							
							
						 
						
							2016-12-21 10:30:52 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									a3020 
								
							 
						 
						
							
							
								
							
							
	462663fbdd  
						 
						
							
							
								
								
								Explicitly  
							
							
							
						 
						
							2016-12-20 11:42:05 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Biard 
								
							 
						 
						
							
							
								
							
							
	e1625f1f94  
						 
						
							
							
								
								
								Modification of the filters  
							
							
							
						 
						
							2016-11-16 14:11:11 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sébastien Lavoie 
								
							 
						 
						
							
							
								
							
							
	e9f87eee94  
						 
						
							
							
								
								
								Added documentation for the watermark filter ( #221 )  
							
							... 
							
							
							
							Added documentation for the watermark filter 
							
						 
						
							2016-05-02 19:24:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Diego 
								
							 
						 
						
							
							
								
							
							
	fcedd81332  
						 
						
							
							
								
								
								fix audio example on README.md  
							
							
							
						 
						
							2014-12-03 21:59:27 -02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	3a0c6a1e1e  
						 
						
							
							
								
								
								Prepare version 0.5.0  
							
							
							
						 
						
							2014-08-12 21:05:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	c1993b6b92  
						 
						
							
							
								
								
								Merge branch 'master' of github.com:SimonSimCity/PHP-FFMpeg into SimonSimCity-master  
							
							... 
							
							
							
							* 'master' of github.com:SimonSimCity/PHP-FFMpeg:
  checkstyle by php-cs-fixer
  Added configuration for audio channels 
							
						 
						
							2014-08-12 20:53:47 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Simon Schick 
								
							 
						 
						
							
							
								
							
							
	7004e53399  
						 
						
							
							
								
								
								Added configuration for audio channels  
							
							
							
						 
						
							2014-06-25 10:21:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Simon Schick 
								
							 
						 
						
							
							
								
							
							
	521c708290  
						 
						
							
							
								
								
								Fixed sample for duration and added sample for codec_name  
							
							... 
							
							
							
							I've updated the README file, because the existing example for getting the duration of a file was not working for file-types like WebM (see #103 ).
To not to loose the sample that was already in place, I changed it to return the codec-name for the video. Maybe returning width or height of a video is more used, but we can't have a sample for all ;) 
							
						 
						
							2014-06-03 09:47:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	4ebd4a0166  
						 
						
							
							
								
								
								Update Travis icon  
							
							
							
						 
						
							2014-02-28 00:23:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	b9a908e889  
						 
						
							
							
								
								
								Update travis icon  
							
							
							
						 
						
							2014-02-28 00:22:46 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	18abae55a9  
						 
						
							
							
								
								
								Fix compatibility with avconv 0.9  
							
							
							
						 
						
							2013-12-02 14:05:18 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Romain Neutron 
								
							 
						 
						
							
							
								
							
							
	5a9d4a0f04  
						 
						
							
							
								
								
								Update README  
							
							
							
						 
						
							2013-11-29 11:38:16 +01:00