stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-22 14:55:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Include the gallery_toolkit_path in the path when determining the location of ffmpeg.

Browse Source
This commit is contained in:
Tim Almdal
2009-10-31 16:23:08 -07:00
parent 1c428df9e0
commit e72022f062
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/helpers/movie.php
+4 -1
View File
@@ -190,7 +190,10 @@ class movie_Core {
static function find_ffmpeg() {
if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) {
putenv("PATH=" . getenv("PATH") . ":/usr/local/bin:/opt/local/bin:/opt/bin");
$graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .
":/usr/local/bin:/opt/local/bin:/opt/bin");
if (function_exists("exec")) {
$ffmpeg_path = exec("which ffmpeg");
}