diff options
Diffstat (limited to 'modules/gallery/helpers/movie.php')
| -rw-r--r-- | modules/gallery/helpers/movie.php | 8 | 
1 files changed, 5 insertions, 3 deletions
| diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 3aa40dc9..986d5f62 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -142,10 +142,12 @@ class movie_Core {      if (!$ffmpeg_path = module::get_var("gallery", "ffmpeg_path")) {        if (function_exists("exec")) {          $ffmpeg_path = exec("which ffmpeg"); -        if ($ffmpeg_path) { -          module::set_var("gallery", "ffmpeg_path", $ffmpeg_path); -        }        } + +      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;    } | 
