diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-12 06:08:14 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-12 06:08:14 -0700 |
| commit | fcddeefa59e3db8ebc0b394b38e9aef2ddf00371 (patch) | |
| tree | 8ec935f1703c187f974b1dc243c403adb2d937a3 /modules/gallery/helpers/movie.php | |
| parent | f369b8fabfdffe475464827d6225b2d4895aadb5 (diff) | |
| parent | 67c81087131e7ef3e4d50ac549bc58dcc98d8cef (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
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; |