diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-02 22:14:31 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-02 22:14:31 +0100 |
| commit | f826c09abc48a522c1a27b44a3fda1e337d90a1a (patch) | |
| tree | f53302b072bae510e4d07d72c89b4238614df458 /Zotlabs/Thumbs/Video.php | |
| parent | e418a6b3d498cb237bd8f6dd01f40fe57d4a868d (diff) | |
| parent | 3bd7133ba32d758df935a566c45515a530b35538 (diff) | |
| download | volse-hubzilla-f826c09abc48a522c1a27b44a3fda1e337d90a1a.tar.gz volse-hubzilla-f826c09abc48a522c1a27b44a3fda1e337d90a1a.tar.bz2 volse-hubzilla-f826c09abc48a522c1a27b44a3fda1e337d90a1a.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Thumbs/Video.php')
| -rw-r--r-- | Zotlabs/Thumbs/Video.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zotlabs/Thumbs/Video.php b/Zotlabs/Thumbs/Video.php index d0f72bcdd..05127355e 100644 --- a/Zotlabs/Thumbs/Video.php +++ b/Zotlabs/Thumbs/Video.php @@ -38,6 +38,12 @@ class Video { * for the web server user, errors may be reported in the web server logs. */ + + $ffmpeg = trim(shell_exec('which ffmpeg')); + if($ffmpeg) { + logger('ffmpeg not found in path. Video thumbnails may fail.'); + } + $imagick_path = get_config('system','imagick_convert_path'); if($imagick_path && @file_exists($imagick_path)) { $cmd = $imagick_path . ' ' . escapeshellarg(PROJECT_BASE . '/' . $tmpfile . '[0]') . ' -thumbnail ' . $width . 'x' . $height . ' ' . escapeshellarg(PROJECT_BASE . '/' . $outfile); @@ -52,7 +58,7 @@ class Video { @rename($outfile,$file . '.thumb'); } } - + @unlink($tmpfile); } } |