diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-06-24 23:40:57 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-06-24 23:40:57 -0600 |
| commit | f70517a8e88b280c2b380f2bde7ff9d85146506f (patch) | |
| tree | a8e86434282eab242009e9cda145c5b5764a39d5 /modules/gallery/helpers/movie.php | |
| parent | 043469587ed03a2a4e05aa2fddcebe53f04b0ce4 (diff) | |
| parent | 766de009090cd1a49b6726e79bce7a69392491be (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 28c15d81..fcf1cc54 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -145,7 +145,7 @@ class movie_Core { static function find_ffmpeg() { if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) { - putenv("PATH=" . getenv("PATH") . ":/usr/local/bin"); + putenv("PATH=" . getenv("PATH") . ":/usr/local/bin:/opt/local/bin"); if (function_exists("exec")) { $ffmpeg_path = exec("which ffmpeg"); } |