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
..
FFMpeg	Merge branch 'master' of github.com:SimonSimCity/PHP-FFMpeg into SimonSimCity-master	2014-08-12 20:53:47 +02:00
files	Added watermark functionality and unit tests	2014-07-28 17:27:12 +08:00
fixtures/ffprobe	Version 0.3	2013-06-25 10:03:20 +02:00
bootstrap.php	Version 0.3	2013-06-25 10:03:20 +02:00