diff options
| author | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-09-20 04:30:34 +0300 |
|---|---|---|
| committer | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-09-20 04:30:34 +0300 |
| commit | ce80259d6939e43aaea34eba7bea4b2a602a5019 (patch) | |
| tree | 7ca81d874b62c5a2c0244657aa903d565a7e6b04 /modules/gallery/helpers/movie.php | |
| parent | ba950bec0c84a1467aa2545ca815d5af7b0b002b (diff) | |
| parent | 93d1a8103e757a87fb006f2389f0ee24497367a7 (diff) | |
Merge remote branch 'gallery3/master'
Diffstat (limited to 'modules/gallery/helpers/movie.php')
| -rw-r--r-- | modules/gallery/helpers/movie.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 3e55eefe..50339541 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -86,9 +86,10 @@ class movie_Core { static function find_ffmpeg() { if (!($ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) || !file_exists($ffmpeg_path)) { $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null); + $extra_binary_paths = module::get_var("gallery", "extra_binary_paths", null); putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") . - ":/usr/local/bin:/opt/local/bin:/opt/bin"); + ":" . $extra_binary_paths); if (function_exists("exec")) { $ffmpeg_path = exec("which ffmpeg"); } |