diff options
| author | Romain LE DISEZ <romain.git@ledisez.net> | 2009-06-25 08:16:35 +0200 |
|---|---|---|
| committer | Romain LE DISEZ <romain.git@ledisez.net> | 2009-06-25 08:16:35 +0200 |
| commit | 6345fcede7493010ab78239c3e775d16c2f41458 (patch) | |
| tree | 3bcdf7732386e2026a9c52688f303dd6fdffbfa5 /modules/gallery/helpers/movie.php | |
| parent | be354ab98bbb08abad0a7efd6fb1d110e11381de (diff) | |
| parent | ec67300f9628582bf735468c73aec3c01a6eb57f (diff) | |
Merge commit 'upstream/master'
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"); } |