Merge commit 'upstream/master'

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index fcf1cc54..d62ead76 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -82,7 +82,7 @@ class movie_Core {
     $movie->rand_key = ((float)mt_rand()) / (float)mt_getrandmax();
 
     // Randomize the name if there's a conflict
-    while (ORM::Factory("item")
+    while (ORM::factory("item")
            ->where("parent_id", $parent->id)
            ->where("name", $movie->name)
            ->find()->id) {
@@ -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:/opt/local/bin");
+      putenv("PATH=" . getenv("PATH") . ":/usr/local/bin:/opt/local/bin:/opt/bin");
       if (function_exists("exec")) {
         $ffmpeg_path = exec("which ffmpeg");
       }