diff options
author | Bharat Mediratta <bharat@menalto.com> | 2009-06-12 00:58:34 -0700 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2009-06-12 00:58:34 -0700 |
commit | b70623118ab05ecffb00e26c7eb823c3ee94ce0d (patch) | |
tree | 7be970d59615126f37eb6c58fc4d4ffc2de54dc3 /modules/gallery/helpers/movie.php | |
parent | 0b23433d947bb986db9b1d5775631306e23ed1f4 (diff) |
Add /usr/local/bin to PATH before trying to detect binaries.
Diffstat (limited to 'modules/gallery/helpers/movie.php')
-rw-r--r-- | modules/gallery/helpers/movie.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 986d5f62..1d1d29d1 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -140,13 +140,11 @@ class movie_Core { static function find_ffmpeg() { if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) { + putenv("PATH=" . getenv("PATH") . ":/usr/local/bin"); if (function_exists("exec")) { $ffmpeg_path = exec("which ffmpeg"); } - if (empty($ffmpeg) && @file_exists("/usr/local/bin/ffmpeg")) { - $ffmpeg_path = "/usr/local/bin/ffmpeg"; - } module::set_var("gallery", "ffmpeg_path", $ffmpeg_path); } return $ffmpeg_path; |