hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add check on Video icon on video thumbnail

Browse Source
This commit is contained in:
Romain Neutron
2012-03-26 13:57:50 +02:00
parent 5478e668d8
commit 85f32e4e23
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/binaryAdapter/video/toimage/ffmpeg.class.php
View File

@@ -88,8 +88,12 @@ class binaryAdapter_video_toimage_ffmpeg extends binaryAdapter_video_processorAb
$this->log("Commande executee : $cmd \n");
if ( ! file_exists($tmpFile))
{
throw new Exception('Unable to extract image');
}
if (file_exists($this->registry->get('GV_RootPath') . 'www/skins/icons/play.png'))
{
$cmd = $this->registry->get('GV_pathcomposite')
. ' -gravity SouthEast -quiet -compose over "'
. $this->registry->get('GV_RootPath') . 'www/skins/icons/play.png"'
@@ -98,6 +102,12 @@ class binaryAdapter_video_toimage_ffmpeg extends binaryAdapter_video_processorAb
$this->shell_cmd($cmd);
unlink($tmpFile);
}
else
{
rename($tmpFile, $dest);
}
rmdir($tmpDir);
return $this;