dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add ExecutableNotFoundException

Browse source
This commit is contained in:
Romain Neutron 2013-07-03 14:13:29 +02:00
commit 8e87d243d9
7 changed files with 61 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/FFMpeg/FFMpeg.php
View file

@ -115,22 +115,10 @@ class FFMpeg
*/
public static function create($configuration = array(), LoggerInterface $logger = null, FFProbe $probe = null)
{
if (!$configuration instanceof ConfigurationInterface) {
$configuration = new Configuration($configuration);
}
$binaries = $configuration->get('ffmpeg.binaries', array('avconv', 'ffmpeg'));
if (!$configuration->has('timeout')) {
$configuration->set('timeout', 300);
}
$driver = FFMpegDriver::load($binaries, $logger, $configuration);
if (null === $probe) {
$probe = FFProbe::create($configuration, $logger, null);
}
return new static($driver, $probe);
return new static(FFMpegDriver::create($logger, $configuration), $probe);
}
}