diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-11-01 10:43:37 -0700 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-11-01 10:43:37 -0700 |
| commit | 7ae4b35d787bf51ac98baf1c1818f580e0195016 (patch) | |
| tree | 5a7498da81e41aa68d2456068a612f5608a3b405 /modules/gallery/helpers/movie.php | |
| parent | 268ab9e079460a8e876d5b45b06ca4d9eecf767b (diff) | |
| parent | 488b67014b44baf8bb19deaf7c77e87a95be220b (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers/movie.php')
| -rw-r--r-- | modules/gallery/helpers/movie.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 6dac0803..e84e8ea6 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -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"); } |