diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-06-12 15:58:34 +0800 |
|---|---|---|
| committer | <unostar@danalan.info> | 2009-06-12 21:21:00 +0800 |
| commit | 35e5a7d69b04bef171ed30b2f31aad32b83b19f0 (patch) | |
| tree | 86565196574ea3008ddbc8dedd383a53cffe3fab /modules/gallery/helpers/movie.php | |
| parent | 9e348c51c1c61aacd53628b099ca6c344926835b (diff) | |
Add /usr/local/bin to PATH before trying to detect binaries.
Signed-off-by: <unostar@danalan.info>
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; |
